Commit Graph

40780 Commits

Author SHA1 Message Date
Sage Weil
9d0dcc1f06 Merge pull request #4228 from athanatos/wip-11280
Wip 11280

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-31 09:38:48 -07:00
Samuel Just
e5ff97201f Merge pull request #4207 from ceph/wip-11177
common: fix logging default channel to be 'cluster' not 'default' (11177)

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-03-31 09:26:56 -07:00
Gregory Farnum
ba12448c80 Merge pull request #4211 from ceph/wip-11120
osdc/Striper.cc fix stripe_count == 1 && stripe_unit != object_size

Reviewed-by: John Spray <jspray@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-03-31 09:26:04 -07:00
Samuel Just
0b2e272430 ReplicatedPG::cancel_pull: requeue waiters as well
If we are in recovery_wait, we might not recover that object as part of
recover_primary for some time.  Worse, if we are waiting on a backfill
which is blocked waiting on a copy_from on the missing object in
question, it can become a dead lock.

Fixes: 11244
Backport: firefly
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-03-31 09:21:36 -07:00
Samuel Just
23efab7d4f ReplicatedPG: don't write hitset while scrubbing, update scrub_cstat
Fixes: 11263
Fixes: 11262
Backport: firefly
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-03-31 09:21:04 -07:00
Samuel Just
85307b933d ReplicatedPG: in do_op, requeue op if we requeue waiters in agent_choose_mode
The current op might be ordered after a waiter.

Fixes: 11280
Backport: firefly
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-03-31 09:20:28 -07:00
Samuel Just
b1f078bc22 ReplicatedPG: requeue waiting_for_active before waiting_for_cache_not_full
The waiting_for_cache_not_full waiters must be dequeued first.

Fixes: 11267
Backport: firefly
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-03-31 09:20:20 -07:00
Kefu Chai
508ee9bb95 Merge pull request #4225 from Fale/patch-1
doc: fix the architecture diagram in cephfs.rst

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-04-01 00:05:51 +08:00
Fabio Alessandro Locati
d5d6468e88 doc: fix the architecture diagram in cephfs.rst
Signed-off-by: Fabio Alessandro Locati <fabio@locati.cc>
2015-03-31 18:00:45 +02:00
Samuel Just
b0a3941ff6 ReplicatedPG::promote_object: do not create obc if not promoting
Otherwise, we can leave an incorrect cached obc around.

Introduced: 65bb4df599
Fixes: 11284
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-03-31 08:41:09 -07:00
Samuel Just
bdc664fb3d ECTransaction: write out the hinfo key on touch as well
This way, even empty objects have the hinfo key written.  That way,
touch and touch->append->truncate end up with the same state.

Fixes: 11265
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-03-31 08:30:10 -07:00
John Spray
9b171d23eb Merge pull request #4215 from ceph/wip-11258
Wip 11258

Reviewed-by: John Spray <john.spray@redhat.com>
2015-03-31 14:23:19 +01:00
Xiaoxi Chen
4c122c1a46 Set disableDataSync to false
If datasync is disabled, we may potentially lose data
on power failure.

Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
2015-03-31 08:44:57 +08:00
Xiaoxi Chen
0bd767fb7e Update RocksDB configuration to make it more clear
Add some performance critial configurations

Also group and polish the description of each configuration
to make it more clear, changed the default from 0 to actual
value.

Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
2015-03-31 08:44:57 +08:00
Sage Weil
497737aabf Merge remote-tracking branch 'gh/hammer'
Conflicts:
	src/gmock
	src/osd/ReplicatedPG.cc
2015-03-30 15:41:13 -07:00
Josh Durgin
febb5a47f0 librados: define C++ global flags from the C constants
This will help prevent drift in the future. It also makes it clear
that the flags are supposed to have the same values.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-03-30 15:29:24 -07:00
Josh Durgin
b2b436906d test: add librados global op flags test
Just verify that the read gets the right data, to demonstrate that
passing a flag doesn't cause problems.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-03-30 15:19:25 -07:00
Sage Weil
c7de236d2f os/KeyValueDB: skip experimental check for test_init
We don't want to spit out the warning twice, and we don't have cct
anyway.

Also test_init is annoying; we should try to kill it.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-30 15:14:15 -07:00
Josh Durgin
7e5b81b381 Revert "librados: remove the unused flags."
This reverts commit 4bd2bd6bb8.

These constants are the only way these flags are exposed through the C
interface. C users can't include librados.hpp.  Ideally we would have
only one version of these (just the C ones), but the C++ ones came
first and need to stay for backwards compatibility.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-03-30 13:22:16 -07:00
Sage Weil
2e908f1e87 Merge pull request #3878 from ceph/wip-dirty-pg-keys
osd: coalesce into single omap_setkeys for normal writes

Tested-by: Andreas Bluemle <andreas.bluemle@itxperts.de>
Reviewed-by: David Zafman <dzafman@redhat.com>
2015-03-30 11:18:56 -07:00
Loic Dachary
b28a42ce32 Merge pull request #4212 from zhouyuan/isal_2.13
erasure-code: Update ISA-L to 2.13

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-30 20:17:38 +02:00
Sage Weil
a05871a185 Merge pull request #4160 from ceph/wip-rocksdb
update rocksdb
2015-03-30 10:57:07 -07:00
Sage Weil
8e5d4c66dc osd: drop unused utime_t now arg to issue_repop
Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-30 10:45:00 -07:00
Jianpeng Ma
8db4056ba8 osd: do not update mtime when recording digest
The user mtime and local_mtime are normally set in finish_ctx based on the
value of ctx->mtime; clear that to avoid this update.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
[Sage: simplified]
Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-30 10:41:58 -07:00
Sage Weil
a4c01f38f1 mark kinetic experimental
Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-30 10:00:01 -07:00
Sage Weil
002b7fdadf mark rocksdb experimental
Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-30 10:00:01 -07:00
Loic Dachary
6f4936ee96 Merge pull request #4131 from t-miyamae/wip-mshec-documentation-h2
erasure code: add shec's documentation / change default layout

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-30 14:37:08 +02:00
Yan, Zheng
ccdeaf87df mds: fix out-of-order messages
When MDS is no longer laggy, it should process deferred messages
first, then process newly received messages.

Fix: #11258
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-03-30 17:49:06 +08:00
Kefu Chai
f47a572424 Merge pull request #4183 from stiopaa1/OSDMonTrailingSpaces
mon/OSDMonitor: remove trailing whitespaces

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-03-30 16:43:37 +08:00
Yuan Zhou
59aa6700fa erasure-code: Update ISA-L to 2.13
ISA-L 2.13 brings better performance on Avoton (20%). There's no impact on Xeon
platform. The details are in the release notes.

There's a new API ec_encode_data_update() for incremental encoding
and decoding. The other highlevel API keeps the same as in 2.10

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
2015-03-30 13:39:31 +08:00
Yan, Zheng
ad15f7d795 osdc/Striper.cc fix stripe_count == 1 && stripe_unit != object_size
Fixes:11120
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-03-30 11:30:35 +08:00
Gregory Farnum
493eff569e Merge pull request #4209 from ceph/wip-java
fix rhel linking error

Backport: giant, firefly, dumpling

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-03-28 11:02:52 -07:00
Noah Watkins
aed3434dc7 java: libcephfs_jni.so is in /usr/lib64 on rhel
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2015-03-27 19:34:12 -07:00
Noah Watkins
f5a95dc700 java: dump extra info for ftruncate assertion
Nightly ran and encountered a situation in which fstat following
ftruncate reported a size not equal to the truncated size.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2015-03-27 19:09:15 -07:00
David Zafman
491474f7b7 test: Add testing for PGLog::filter_log()
Indirectly tests pg_log_t::filter_log()

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-03-27 18:25:24 -07:00
David Zafman
1fcd3fbdef osd: Create a filter_log for PGLog
This could be tested as a way to test pg_log_t::filter_log()

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-03-27 18:23:08 -07:00
David Zafman
c751191f65 ceph-objectstore-tool, osd: Filter the pg_log_t for objects no longer in pg
Fixes: #11184

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-03-27 18:23:08 -07:00
Sage Weil
ccc08397e6 common: send cluster log messages to 'cluster' channel by default
The CLOG_CHANNEL_DEFAULT constant was being abused for two purposes:

 - the default channel to log messages to
 - the name of the config option key in the key/value pair string that is
   used for the default option, e.g. "default=true foo=false bar=false"

Fix this by making the config option key CLOG_CONFIG_DEFAULT_KEY and
replacing throughout, and changing CLOG_CHANNEL_DEFAULT to "cluster" (as
it should be and has been historically).

Fixes: #11177
Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-27 15:35:21 -07:00
Gregory Farnum
71a0c793ab Merge pull request #4203 from Vicente-Cheng/fixed-get-mdsmap-assertion
mds: fixed the ceph get mdsmap assertion.

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-03-27 11:35:30 -07:00
Gregory Farnum
c50f5b1e26 Merge pull request #4173 from ceph/wip-mds-kill-session
Wip mds kill session

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: John Spray <jspray@redhat.com>
2015-03-27 11:29:19 -07:00
Gregory Farnum
7721b224c4 Merge pull request #4168 from ceph/wip-11226-dir-fx
RFC client: Hold on to exclusive caps on directories we "own"

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-27 11:28:31 -07:00
Gregory Farnum
0e4a75b2e3 Merge pull request #4177 from ceph/wip-11226-extra
Wip 11226 extra

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-03-27 11:27:58 -07:00
Gregory Farnum
413da564d4 Merge pull request #4189 from ceph/wip-11236
test_libcephfs: do cleanup in ReleaseMounted test

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-03-27 11:26:21 -07:00
Gregory Farnum
bd1d11f6eb Merge pull request #4192 from ceph/wip-11218
#11218: Multi-MDS fixes for 'damaged' ranks

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-03-27 11:24:50 -07:00
Josh Durgin
015c643735 Merge pull request #4199 from ceph/wip-11250
cls_rbd: fix read past end of bufferlist c_str() in debug log msg

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-03-27 08:51:19 -07:00
Sage Weil
59143d141c Merge pull request #4194 from athanatos/wip-11199
ReplicatedPG: trim backfill intervals based on peer's last_backfill_star...

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-27 08:15:29 -07:00
Sage Weil
efb66b9120 Merge pull request #4195 from athanatos/wip-11197
PG: set/clear CREATING in Primary state entry/exit

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-27 08:10:20 -07:00
John Spray
f3f37a3293 Merge pull request #4200 from ceph/wip-mds-remove-inode
mds: properly remove inode after purging stray

Reviewed-by: John Spray <john.spray@redhat.com>
2015-03-27 11:33:07 +00:00
Vicente Cheng
f4398d2e6c Fixed the ceph get mdsmap assertion.
When we want to get mdsmap, we try to get_version()
    and the return value err = 0 means success.

    The assert verified r == 0. r would not change in this flow.
    It always meet assert and lead mon failure.

    I think this verify should be:
        assert(err == 0)
    It will help to check return value of get_version().

If you have any questions, feel free to let me know.
Thanks!

Signed-off-by: Vicente Cheng <freeze.bilsted@gmail.com>
2015-03-27 18:49:28 +08:00
Kefu Chai
d3029fe72a Merge pull request #4193 from larkly/patch-docerror-erasure
doc: Incomplete example in erasure-coded-pool.rst

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-03-27 18:31:16 +08:00