]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Noah Watkins [Tue, 24 Feb 2015 03:59:51 +0000 (19:59 -0800)]
qa: update old replication tests
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Noah Watkins [Mon, 23 Feb 2015 01:35:50 +0000 (17:35 -0800)]
hadoop: add terasort workunit
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Sage Weil [Sun, 22 Feb 2015 05:52:03 +0000 (21:52 -0800)]
Merge remote-tracking branch 'gh/hammer'
Kefu Chai [Sun, 22 Feb 2015 02:10:40 +0000 (10:10 +0800)]
Merge pull request #3741 from ceph/wip-cmake-vstart
cmake fixes and enable vstart with cmake build
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Sat, 21 Feb 2015 18:10:12 +0000 (10:10 -0800)]
Merge pull request #3729 from guangyy/wip-4254-hammer
osd: number of degraded objects in EC pool is wrong when there is OSD down(in).
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Sat, 21 Feb 2015 18:08:59 +0000 (10:08 -0800)]
Merge pull request #3722 from ceph/wip-10787
mon: fix osd_epoch cache bug 10787
Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
Sage Weil [Sat, 21 Feb 2015 18:07:20 +0000 (10:07 -0800)]
Merge branch 'osd-fix' of git://github.com/wonzhq/ceph into hammer
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Sage Weil [Sat, 21 Feb 2015 18:05:55 +0000 (10:05 -0800)]
Merge branch 'wip-5639' of git://github.com/rzarzynski/ceph into hammer
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 20 Feb 2015 23:18:41 +0000 (15:18 -0800)]
Merge pull request #3760 from ceph/wip-10883
osd: Fix FileJournal wrap to get header out first
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 20 Feb 2015 23:14:03 +0000 (15:14 -0800)]
Merge pull request #3767 from athanatos/wip-10881
Wip 10881
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 20 Feb 2015 23:10:35 +0000 (15:10 -0800)]
Merge pull request #3768 from athanatos/wip-10780
Wip 10780
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 20 Feb 2015 23:08:20 +0000 (15:08 -0800)]
Merge pull request #3769 from athanatos/wip-10908
Wip 10908
Reviewed-by: Sage Weil <sage@redhat.com>
Yehuda Sadeh [Fri, 13 Feb 2015 23:41:29 +0000 (15:41 -0800)]
cmake: radosgw, radosgw-admin related fixes
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Fri, 13 Feb 2015 22:34:06 +0000 (14:34 -0800)]
vstart.sh: can use binaries outside of ceph/src
If setting CEPH_BUILD_ROOT, will use that path, otherwise runs
everything from current directory as before.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Fri, 20 Feb 2015 21:06:44 +0000 (13:06 -0800)]
Merge pull request #3612 from zhouyuan/acct_get_resp_headers
rgw: Adding stats in the header of GET response on account
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Fri, 20 Feb 2015 21:03:00 +0000 (13:03 -0800)]
Merge pull request #3648 from theanalyst/doc/swift-temp-url
doc: swift tempurl functionality
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Loic Dachary [Fri, 20 Feb 2015 18:01:22 +0000 (19:01 +0100)]
Merge pull request #3766 from tchaikov/chain_xattr-wrong-size-for-snprintf
os/chain_xattr: fix wrong `size` for snprintf()
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Ken Dreyer [Fri, 20 Feb 2015 17:44:45 +0000 (10:44 -0700)]
Merge pull request #3744 from ceph/wip-10884-hammer-rpm-devel-split
ceph.spec: split ceph-devel to appropriate *-devel packages
Reviewed-by: Sandon Van Ness <sandon@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Kefu Chai [Fri, 20 Feb 2015 16:55:17 +0000 (00:55 +0800)]
os/chain_xattr: fix wrong `size` for snprintf()
Signed-off-by: Kefu Chai <kchai@redhat.com>
Josh Durgin [Fri, 20 Feb 2015 17:00:26 +0000 (09:00 -0800)]
Merge pull request #3764 from ceph/wip-10919
cls_rbd: invalidate bufferlist CRC when updating object map
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Josh Durgin [Fri, 20 Feb 2015 16:56:58 +0000 (08:56 -0800)]
Merge pull request #3754 from ceph/wip-10907
rgw: pass civetweb configurables to civetweb
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Fri, 20 Feb 2015 16:52:51 +0000 (08:52 -0800)]
Merge pull request #3762 from fghaas/master
doc: explain that ceph tell osd.N bench is non-destructive
Sage Weil [Fri, 20 Feb 2015 16:18:48 +0000 (08:18 -0800)]
Merge pull request #3697 from yuyuyu101/wip-async-fix-2
AsyncMessenger: Fix fd leak and lossless_peer_reuse policy problem
Jason Dillaman [Fri, 20 Feb 2015 15:37:59 +0000 (10:37 -0500)]
cls_rbd: invalidate bufferlist CRC when updating object map
The bit vector was not invalidating the bufferlist's CRC, resulting
in peer OSDs rejecting write op due to a mismatched CRC on the
message.
Fixes: #10919
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Florian Haas [Fri, 20 Feb 2015 14:25:23 +0000 (15:25 +0100)]
doc: explain that tell bench is non-destructive
Mention that "ceph tell osd.N bench" will not overwrite data in a live
OSD, but might temporarily affect OSD performance.
Signed-off-by: Florian Haas <florian@hastexo.com>
Sage Weil [Fri, 20 Feb 2015 05:28:16 +0000 (21:28 -0800)]
Merge remote-tracking branch 'gh/hammer'
Josh Durgin [Fri, 20 Feb 2015 02:47:16 +0000 (18:47 -0800)]
Merge pull request #3759 from ceph/wip-10914
osdc: pass fadvise op flags to WritebackHandler read requests
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
David Zafman [Thu, 19 Feb 2015 00:21:12 +0000 (16:21 -0800)]
osd: Fix FileJournal wrap to get header out first
Correct and restore assert that was removed
Cause by
f46b1b473fce0322a672b16c7739e569a45054b6
Fixes: #10883
Backport: dumpling, firefly, giant
Signed-off-by: David Zafman <dzafman@redhat.com>
Jason Dillaman [Thu, 19 Feb 2015 20:38:32 +0000 (15:38 -0500)]
osdc: pass fadvise op flags to WritebackHandler read requests
librbd was previously attempting to cast the provided Context to
retrieve the fadvise flags. To eliminate the unsafe cast, now
the fadvise flags are directly passed to the WritebackHandler::read
callback.
Fixes: #10914
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Sage Weil [Thu, 12 Feb 2015 22:16:53 +0000 (14:16 -0800)]
osd/OSDMap: include pg_temp count in summary
It is useful to know how big the pg_temp map is. Strictly speaking
this is part of the OSDMap so I'm including it here. It looks like
this:
osdmap e25: 3 osds: 3 up, 3 in; 1 remapped pgs
It might be more user-friendly to put it in a line with the pgmap
somewhere (where other pg counts are included), but it doesn't quite
fit there either. So sticking with where it lives in the data
structure!
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
db06582a067439a57e0d7f0da2193fc479736200 )
Sage Weil [Thu, 19 Feb 2015 19:03:06 +0000 (11:03 -0800)]
Merge pull request #3629 from liewegas/wip-pg-temp
osd/OSDMap: include pg_temp count in summary
Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Sage Weil [Thu, 19 Feb 2015 19:02:26 +0000 (11:02 -0800)]
Merge pull request #3663 from ceph/wip-10765
librados: close watch/notify race
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Thu, 19 Feb 2015 19:02:08 +0000 (11:02 -0800)]
Merge pull request #3693 from ceph/wip-objecter-linger-locking
objecter: clean up linger op locking
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 19 Feb 2015 19:01:07 +0000 (11:01 -0800)]
Merge pull request #3710 from ceph/wip-10844
mon: MonCap: take EntityName instead when expanding profiles
Reviewed-by: Sage Weil <sage@redhat.com>
Kefu Chai [Thu, 19 Feb 2015 07:27:35 +0000 (15:27 +0800)]
Merge pull request #3748 from ceph/wip-pg-refs
osd: a few things to fix pg ref tracking
Reviewed-by: Kefu Chai <kchai@redhat.com>
Samuel Just [Tue, 17 Feb 2015 18:08:01 +0000 (10:08 -0800)]
PG: compensate for bug 10780 on older peers
Previously, there was a harmless bug where we didn't fill in the
last_epoch_started field for a peer which we are resetting the
last_backfill line for. It's no longer harmless since we use that
as the activation epoch, so if the peer is missing the MIN_SIZE
feature bit, we fill in the last_epoch_started it meant to fill in.
Signed-off-by: Samuel Just <sjust@redhat.com>
Samuel Just [Tue, 17 Feb 2015 18:06:19 +0000 (10:06 -0800)]
PG: add a config option to enable (by default) recovery below min_size
This may be useful at some point.
Signed-off-by: Samuel Just <sjust@redhat.com>
Josh Durgin [Wed, 18 Feb 2015 16:55:13 +0000 (08:55 -0800)]
Merge pull request #3756 from ceph/wip-10899
librbd: fixed ImageWatcher recursive locking issues
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Loic Dachary [Wed, 18 Feb 2015 16:14:14 +0000 (17:14 +0100)]
Merge pull request #3755 from t-miyamae/wip-mshec-documentation
erasure code: add shec's documentation / change default layout
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Jason Dillaman [Wed, 18 Feb 2015 16:10:57 +0000 (11:10 -0500)]
librbd: fixed ImageWatcher recursive locking issues
It was possible for ImageWatcher to attempt to re-acquire held locks
via context callbacks. This issue affected resizing/flattening when
no work was required and rescheduling a watch upon two successive
failures.
Fixes: #10899
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Takeshi Miyamae [Wed, 18 Feb 2015 11:42:50 +0000 (20:42 +0900)]
erasure code: add shec's documentation / change default layout
Signed-off-by: Takeshi Miyamae <miyamae.takeshi@jp.fujitsu.com>
Loic Dachary [Wed, 18 Feb 2015 10:29:09 +0000 (11:29 +0100)]
Merge pull request #3651 from swamireddy/wip-v092-organizationmap
mailmap: v092 organizationmap
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Swami Reddy [Fri, 6 Feb 2015 10:34:12 +0000 (16:04 +0530)]
mailmap: add Matt Richards to organizationmap
Signed-off-by: Swami Reddy M R <swami.reddy@ril.com>
Swami Reddy [Fri, 6 Feb 2015 10:32:18 +0000 (16:02 +0530)]
mailmap: add Xie Rui to organizationmap
Signed-off-by: Swami Reddy M R <swami.reddy@ril.com>
Samuel Just [Tue, 17 Feb 2015 18:29:59 +0000 (10:29 -0800)]
ReplicatedPG: only allow a degraded write if we have at least min_size copies
Also, add a config option to disable the feature.
Signed-off-by: Samuel Just <sjust@redhat.com>
Samuel Just [Tue, 17 Feb 2015 23:30:49 +0000 (15:30 -0800)]
ECBackend: use tbl for empty transaction as well if necessary
Signed-off-by: Samuel Just <sjust@redhat.com>
Samuel Just [Tue, 17 Feb 2015 23:11:14 +0000 (15:11 -0800)]
ReplicatedBackend: use tbl for empty transaction to backfill peer also
Fixes: 10908
Signed-off-by: Samuel Just <sjust@redhat.com>
Samuel Just [Tue, 17 Feb 2015 18:16:57 +0000 (10:16 -0800)]
osd/: s/is_degraded_object/is_degraded_or_backfilling_object
Currently, this method also returns true if the object is backfilling.
Signed-off-by: Samuel Just <sjust@redhat.com>
Yehuda Sadeh [Tue, 17 Feb 2015 23:05:40 +0000 (15:05 -0800)]
rgw: pass civetweb configurables to civetweb
Fixes: #10907
Backport: firefly
Pass any configurables in the rgw frontends config line to civetweb.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Josh Durgin [Tue, 17 Feb 2015 05:58:56 +0000 (21:58 -0800)]
Merge pull request #3749 from ceph/wip-10900
test/librbd/fsx.c: disable RBD object map for krbd
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Tue, 17 Feb 2015 01:50:22 +0000 (17:50 -0800)]
Merge pull request #3747 from ceph/wip-10892
osd: clear obc cache on_shutdown
Reviewed-by: Samuel Just <sjust@redhat.com>
Jason Dillaman [Tue, 17 Feb 2015 01:44:04 +0000 (20:44 -0500)]
test/librbd/fsx.c: disable RBD object map for krbd
RBD object map requires exclusive lock support, which is not
yet available in the kernel client.
Fixes: #10900
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Sage Weil [Tue, 17 Feb 2015 00:36:04 +0000 (16:36 -0800)]
osd: dump pg ref ids on shutdown
(if ref debugging is enabled)
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 17 Feb 2015 00:41:04 +0000 (16:41 -0800)]
osd/PG: make lock() and unlock() const
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 17 Feb 2015 00:40:53 +0000 (16:40 -0800)]
common/tracked_int_ptr: const variants
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 17 Feb 2015 01:08:43 +0000 (17:08 -0800)]
osd: clear obc cache on_shutdown
Fixes: #10892
Signed-off-by: Sage Weil <sage@redhat.com>
Loic Dachary [Mon, 16 Feb 2015 23:31:11 +0000 (00:31 +0100)]
Merge pull request #3746 from nwl/rgw-docs
doc: RGW is "built on top of librgw" changed to "librados"
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Boris Ranto [Wed, 7 Jan 2015 09:00:21 +0000 (10:00 +0100)]
ceph.spec: split ceph-devel to appropriate *-devel packages
ceph-devel contains various header files/bindings for several
libraries, this patch creates *-devel packages for all the libraries
separately and provides the compatibility layer for the split.
http://tracker.ceph.com/issues/10884 Refs: #10884
Signed-off-by: Boris Ranto <branto@redhat.com>
Amended by Ken Dreyer <kdreyer@redhat.com> to add version numbers to the
Obsoletes, add Obsoletes to the libradosstriper1-devel and
libcephfs_jni1-devel subpackages, adjust the librados documentation, and
add the Redmine issue number to this commit log.
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
Neil Levine [Mon, 16 Feb 2015 22:54:09 +0000 (14:54 -0800)]
doc: RGW is "built on top of librgw" changed to "librados"
Signed-off-by: Neil Levine <levine@yoyo.org>
Josh Durgin [Mon, 16 Feb 2015 22:30:27 +0000 (14:30 -0800)]
Merge branch 'hammer'
Josh Durgin [Mon, 16 Feb 2015 22:27:44 +0000 (14:27 -0800)]
Merge branch 'wip-librbd-snaps-object-map' into hammer
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Jason Dillaman [Sat, 14 Feb 2015 06:24:44 +0000 (01:24 -0500)]
librbd: enforce write ordering with snapshot
The md_lock is now held for reading when scheduling write/discards.
Since snap_create now holds the lock for writing and flushes all
pending IO, write/discard operations will now be consistent for a
given request across objects.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Sat, 7 Feb 2015 14:13:10 +0000 (09:13 -0500)]
librbd: use separate files for snapshot object maps
Instead of relying on the built-in object snapshot support,
create a separate object map object for each image snapshot.
This will allow a future repair utility to rebuild the object
map for an image's snapshots.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Sat, 7 Feb 2015 14:57:36 +0000 (09:57 -0500)]
librados_test_stub: added IoCtx::write_full implementation
Mapped IoCtx::write_full to existing test method used by the
ObjectWriteOperation::write_full API method. Also added missing
cls_log implementation for debugging.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Josh Durgin [Mon, 16 Feb 2015 21:33:30 +0000 (13:33 -0800)]
Merge branch 'wip-librbd-object-map-crc' into hammer
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Jason Dillaman [Wed, 4 Feb 2015 07:50:57 +0000 (02:50 -0500)]
librbd: skip invalidating an invalid object map
If the object map is already flagged as invalid, avoid
attempting to set the invalid object map flag again.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Wed, 4 Feb 2015 07:44:50 +0000 (02:44 -0500)]
cls_rbd: added CRC validation to object map
Added a footer to the object map which stores a header CRC and
and data CRCs for each 4KB chunk. Updates to the object map only
require recomputing the CRC to the affected 4KB chunk.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Sage Weil [Mon, 16 Feb 2015 17:08:11 +0000 (09:08 -0800)]
Merge pull request #3739 from athanatos/wip-10840
PG,ReplicatedPG: make missing_digests local to scrub_compare_maps
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 16 Feb 2015 17:00:20 +0000 (09:00 -0800)]
Merge pull request #3738 from athanatos/wip-10830
osd/: include version_t in extra_reqids with promote
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 16 Feb 2015 16:55:32 +0000 (08:55 -0800)]
Merge pull request #3737 from athanatos/wip-10768
ReplicatedPG::on_change: requeue in_progress_async_reads close to last
Reviewed-by: Sage Weil <sage@redhat.com>
Samuel Just [Mon, 16 Feb 2015 15:47:15 +0000 (07:47 -0800)]
Merge pull request #3694 from ceph/wip-10784
Fix 10784: librbd: image has watchers - not removing
Reviewed-by: Sage Weil <sage@redhat.com>
Kefu Chai [Mon, 16 Feb 2015 12:14:43 +0000 (20:14 +0800)]
Merge pull request #3735 from ceph/wip-da-fix-xio-configure
fix configure to reflect the missing libs for xio
Reviewed-by: Kefu Chai <kchai@redhat.com>
Loic Dachary [Mon, 16 Feb 2015 08:44:25 +0000 (09:44 +0100)]
Merge pull request #3716 from t-miyamae/wip-mshec-fix10839
erasure-code: remove tests for when init() is not called in shec
Reviewed-by: Loic Dachary <ldachary@redhat.com>
t-miyamae [Thu, 12 Feb 2015 06:45:02 +0000 (15:45 +0900)]
tests: remove tests for when init() is not called in shec (#10839)
init2_1, init2_2, init2_3 are equivalent to init_1 and also removed.
encode_6, decode_6, create_ruleset_3 are null argument tests,
but the arguments are references of C++, so also removed.
Signed-off-by: Takeshi Miyamae <miyamae.takeshi@jp.fujitsu.com>
Loic Dachary [Sun, 15 Feb 2015 15:09:11 +0000 (16:09 +0100)]
Merge pull request #3732 from Abioy/patch-1
rm some useless codes
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Yongyue Sun [Sat, 14 Feb 2015 10:37:19 +0000 (18:37 +0800)]
rm some useless codes
tls is not used here
Signed-off-by: Yongyue Sun <abioy.sun@gmail.com>
Guang Yang [Fri, 13 Feb 2015 09:19:30 +0000 (09:19 +0000)]
osd: number of degraded objects in EC pool is wrong when there is OSD down(in)
With EC pool (crush rule choose indep), when there is an OSD down, the size of the 'acting' list does not change (CRUSH_ITEM_NONE is used to replace the down OSD), in this case, 'actingset' should be used to calculate the degraded objects.
Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
Yehuda Sadeh [Fri, 13 Feb 2015 19:57:44 +0000 (11:57 -0800)]
cmake: add librbd/test_fixture.cc
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Fri, 13 Feb 2015 18:51:23 +0000 (10:51 -0800)]
cmake: add os/XfsFileStoreBackend.cc to rules
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Loic Dachary [Fri, 13 Feb 2015 17:35:48 +0000 (18:35 +0100)]
Merge pull request #3720 from dachary/wip-10800-shec-experimental
erasure-code: mark the shec plugin as experimental
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Thu, 12 Feb 2015 14:50:21 +0000 (15:50 +0100)]
erasure-code: mark the shec plugin as experimental
Reject the creation of an erasure code profile including plugin=shec
unless --enable-experimental-unrecoverable-data-corrupting-features=shec
is set.
http://tracker.ceph.com/issues/10800 Fixes: #10800
Signed-off-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Thu, 12 Feb 2015 14:41:44 +0000 (15:41 +0100)]
tests: fix unused variable warning
Signed-off-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Thu, 12 Feb 2015 14:34:40 +0000 (15:34 +0100)]
common: capture check_experimental_feature_enabled message
Implement check_experimental_feature_enabled so that it returns the
message instead of unconditionally displaying it via derr. It allows the
caller to display it in another context.
Signed-off-by: Loic Dachary <ldachary@redhat.com>
Sage Weil [Thu, 12 Feb 2015 21:51:17 +0000 (13:51 -0800)]
mon/OSDMonitor: note osd map epoch in one other place
Also add a note about why we don't do it in another.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 12 Feb 2015 21:50:42 +0000 (13:50 -0800)]
mon/OSDMonitor: move osd epoch cache update into helper, add fixme
There is no semantic change here, just a helper to make things more
clear.
Add warning about a potential bug so we don't lose track.
Signed-off-by: Sage Weil <sage@redhat.com>
Kefu Chai [Fri, 13 Feb 2015 12:25:54 +0000 (20:25 +0800)]
Merge pull request #3727 from POPSuL/patch-2
README.md: fix the indent of a command line usage
Reviewed-by: Kefu Chai <kchai@redhat.com>
Viktor Suprun [Thu, 12 Feb 2015 23:17:22 +0000 (09:17 +1000)]
README.md: fix the indent of a command line usage
Spaces replaced with tab
Signed-off-by: Viktor Suprun <popsul1993@gmail.com>
Haomai Wang [Fri, 13 Feb 2015 09:49:50 +0000 (17:49 +0800)]
AsyncConnection: release message when connection is closed
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Fri, 13 Feb 2015 07:29:51 +0000 (15:29 +0800)]
Merge pull request #3725 from XinzeChi/wip-kvstore-op
cleanup: delete useless member variable
Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
Xinze Chi [Fri, 13 Feb 2015 09:05:06 +0000 (09:05 +0000)]
cleanup: delete useless member variable
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
Gregory Farnum [Fri, 13 Feb 2015 06:25:31 +0000 (22:25 -0800)]
Merge pull request #3717 from ceph/wip-decoding-oldest-snap
mds: fix decoding of InodeStore::oldest_snap
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Samuel Just [Thu, 12 Feb 2015 22:54:10 +0000 (14:54 -0800)]
PG,ReplicatedPG: make missing_digests local to scrub_compare_maps
We don't want/need to carry this state between scrub stages, so lets
remove the tempation by simply making it a local to scrub_compare_maps.
This caused a bug where we would attempt to write out the
missing_digests from the previous chunk during all future chunks, which
caused trouble.
Fixes: 10840
Signed-off-by: Samuel Just <sjust@redhat.com>
Josh Durgin [Thu, 12 Feb 2015 23:57:12 +0000 (15:57 -0800)]
Merge remote-tracking branch 'origin/wip-10785' into hammer
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Conflicts:
src/librbd/ImageWatcher.cc
Sage Weil [Thu, 12 Feb 2015 22:44:19 +0000 (14:44 -0800)]
Merge pull request #3723 from concubidated/master
Docs: OSD name, not id, needs to be given to remove an item from crush map
Reviewed-by: Sage Weil <sage@redhat.com>
Tyler Brekke [Thu, 12 Feb 2015 22:37:17 +0000 (14:37 -0800)]
Docs: OSD name, not id, needs to be given to remove an item from the CRUSH map.
Include command for deleteing bucket from the CRUSH map.
Signed-off-by: Tyler Brekke <tbrekke@redhat.com>
Sage Weil [Thu, 12 Feb 2015 22:16:53 +0000 (14:16 -0800)]
osd/OSDMap: include pg_temp count in summary
It is useful to know how big the pg_temp map is. Strictly speaking
this is part of the OSDMap so I'm including it here. It looks like
this:
osdmap e25: 3 osds: 3 up, 3 in; 1 remapped pgs
It might be more user-friendly to put it in a line with the pgmap
somewhere (where other pg counts are included), but it doesn't quite
fit there either. So sticking with where it lives in the data
structure!
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 12 Feb 2015 21:49:50 +0000 (13:49 -0800)]
mon/OSDMonitor: do not trust small values in osd epoch cache
If the epoch cache says the osd has epoch 100 and the osd is asking for
epoch 200+, do not send it 100+.
Fixes: #10787
Backport: giant, firefly
Signed-off-by: Sage Weil <sage@redhat.com>
Joao Eduardo Luis [Wed, 11 Feb 2015 23:36:01 +0000 (23:36 +0000)]
mon: MonCap: take EntityName instead when expanding profiles
entity_name_t is tightly coupled to the messenger, while EntityName is
tied to auth. When expanding profiles we want to tie the profile
expansion to the entity that was authenticated. Otherwise we may incur
in weird behavior such as having caps validation failing because a given
client messenger inst does not match the auth entity it used.
e.g., running
ceph --name osd.0 config-key exists foo daemon-private/osd.X/foo
has entity_name_t 'client.12345' and EntityName 'osd.0'. Using
entity_name_t during profile expansion would not allow the client access
to daemon-private/osd.X/foo (client.12345 != osd.X).
Fixes: #10844
Backport: firefly,giant
Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
Yan, Zheng [Thu, 12 Feb 2015 12:24:45 +0000 (20:24 +0800)]
mds: fix decoding of InodeStore::oldest_snap
There is no ENCODE_START/FINISH block when encoding inode that
embedded in dentry. So we can't use encoding version to check
if the buffer contains InodeStore::oldest_snap. Instead, we check
if the buffer iterator reaches end of buffer.
Signed-off-by: Yan, Zheng <zyan@redhat.com>
Loic Dachary [Thu, 12 Feb 2015 12:40:56 +0000 (13:40 +0100)]
Merge pull request #3698 from dachary/wip-10836-erasure-code-corpus
tests: clone ceph-erasure-code-corpus from ceph
Reviewed-by: Takeshi Miyamae <miyamae.takeshi@jp.fujitsu.com>