]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Sage Weil [Thu, 29 Jun 2017 17:39:28 +0000 (13:39 -0400)]
systemd/ceph-mgr: remove automagic mgr creation hack
For kraken we auto-created mgr daemons next to mon daemons with some
systemd hackery. This is awkward (you can't not get a new mgr daemon when
you deploy a mon), systemd-specific (not implemented for upstart on
trusty), and mostly unexpected. Since ceph-mgr daemons are now first-class
citizens and required for every cluster, make their deployment explicit
and transparent to the administrator. Major upgrades are a rare
opportunity to have the administrator's full attention so take advantage
of it.
This effectively reverts
61d779345e9efbe9a2e3f215af1f1dcf6630f04a and
082199f69dd0bd4c18a5f4baea67a88782586657 (and follow-on fixes).
Fixes/avoids: http://tracker.ceph.com/issues/19994
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 29 Jun 2017 16:21:42 +0000 (11:21 -0500)]
Merge pull request #15894 from liewegas/wip-no-default-pool
mon,osd: do not create rbd pool by default
Kefu Chai [Thu, 29 Jun 2017 04:57:36 +0000 (12:57 +0800)]
Merge pull request #15471 from tchaikov/wip-radostriper-leak-on-fail
libradosstriper: fix MultiAioCompletion leaks on failure
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
David Zafman [Wed, 28 Jun 2017 22:19:43 +0000 (15:19 -0700)]
test: Fix osd-scrub-repair for movement of shards
Signed-off-by: David Zafman <dzafman@redhat.com>
David Zafman [Wed, 28 Jun 2017 21:18:38 +0000 (14:18 -0700)]
test: Clean up extra json output from log
Signed-off-by: David Zafman <dzafman@redhat.com>
David Zafman [Wed, 28 Jun 2017 21:16:04 +0000 (14:16 -0700)]
test: Give time for OSDs to see map with flag change
Signed-off-by: David Zafman <dzafman@redhat.com>
Sage Weil [Thu, 29 Jun 2017 02:31:11 +0000 (21:31 -0500)]
Merge pull request #15812 from dzafman/wip-cot-cleanup
tools: Cleanup dead code in ceph-objectstore-tool
Reviewed-by: Sage Weil <sage@redhat.com>
Casey Bodley [Wed, 28 Jun 2017 20:05:58 +0000 (16:05 -0400)]
Merge pull request #15983 from cbodley/wip-20386
rgw: fix infinite loop in rest api for log list
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Josh Durgin [Wed, 28 Jun 2017 19:32:04 +0000 (12:32 -0700)]
Merge pull request #15635 from dzafman/wip-13837
osd: Corrupt objects stop snaptrim and mark pg snaptrim_error
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Wed, 28 Jun 2017 19:03:02 +0000 (14:03 -0500)]
Merge pull request #15987 from liewegas/wip-19994
doc/release-notes: fix ceph-deploy command
Sage Weil [Wed, 28 Jun 2017 19:02:34 +0000 (15:02 -0400)]
doc/release-notes: fix ceph-deploy command
Signed-off-by: Sage Weil <sage@redhat.com>
Casey Bodley [Wed, 28 Jun 2017 17:32:35 +0000 (13:32 -0400)]
rgw: rest handlers for mdlog and datalog list dont loop
the do-while loops are unnecessary, because cls_log_list() will already
give us the requested number of entries, unless truncated. and these
rest operations return the truncated flag and last_marker, which the
client side is already using to run the same loop
Signed-off-by: Casey Bodley <cbodley@redhat.com>
Casey Bodley [Wed, 28 Jun 2017 16:19:52 +0000 (12:19 -0400)]
rgw: fix RGWMetadataLog::list_entries() for null last_marker
Signed-off-by: Casey Bodley <cbodley@redhat.com>
Casey Bodley [Wed, 28 Jun 2017 16:18:33 +0000 (12:18 -0400)]
rgw: RGWMetadataLog::list_entries() no longer splices
Signed-off-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Wed, 28 Jun 2017 15:14:53 +0000 (08:14 -0700)]
Merge pull request #15850 from rzarzynski/wip-rgw-20384
rgw: fix wrong error code for expired Swift TempURL's links.
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
Yuri Weinstein [Wed, 28 Jun 2017 15:13:02 +0000 (08:13 -0700)]
Merge pull request #15883 from rzarzynski/wip-rgw-20395
rgw: omit X-Account-Access-Control if there is no grant to serialize.
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Wed, 28 Jun 2017 15:12:31 +0000 (08:12 -0700)]
Merge pull request #15884 from joscollin/wip-
1412617 -uninitialized-pointer-field
rgw: initialize non-static class members in ESQueryCompiler
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Wed, 28 Jun 2017 15:12:04 +0000 (08:12 -0700)]
Merge pull request #15886 from joscollin/wip-CID1412616-uninitialized-pointer-field
rgw: initialize Non-static class member worker in RGWReshard
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Wed, 28 Jun 2017 15:08:36 +0000 (08:08 -0700)]
Merge pull request #15888 from joscollin/wip-
1412615 -uninitialized-scalar-field
rgw: initialize Non-static class member val in ESQueryNodeLeafVal_Int
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Wed, 28 Jun 2017 15:07:54 +0000 (08:07 -0700)]
Merge pull request #15913 from smithfarm/wip-20417
tests: rgw.py: put client roles in a separate list
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Sage Weil [Mon, 26 Jun 2017 19:43:28 +0000 (15:43 -0400)]
test,qa/workunits: fix a zillion tests
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Sat, 24 Jun 2017 03:54:09 +0000 (23:54 -0400)]
mon/OSDMonitor: do not start mapping job on empty map
The Mapper doesn't do the completion. Just avoid it in the caller instead
of adding a Finisher or something similarly annoying for the completion.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 23 Jun 2017 20:02:26 +0000 (16:02 -0400)]
qa/tasks/ceph: create rbd pool after starting the osds
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 23 Jun 2017 19:42:45 +0000 (15:42 -0400)]
qa/workunits/ceph-helpers: shorten mon connect timeout
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 22 Jun 2017 17:46:25 +0000 (13:46 -0400)]
osdmaptool: do not create default pool without --with-default-pool
Signed-off-by: Sage Weil <sage@redhat.com>
Greg Farnum [Wed, 14 Jun 2017 20:05:46 +0000 (13:05 -0700)]
test: update TestPGLog's pool_id for the new world (no pool 0)
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
Greg Farnum [Wed, 14 Jun 2017 20:05:19 +0000 (13:05 -0700)]
osdmap: maintain a pool-creating build_simple() for use in unit tests
Change the standard build_simple() so it no longer takes pg[p]_num -- these
params were unused. Add a new build_simple_with_pool() that can be called
when we want the rbd pool to be created by default. These are implemented
via a simple switched function (marked private).
Update the existing callers so they choose the right one for their needs.
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
Greg Farnum [Wed, 14 Jun 2017 18:29:14 +0000 (11:29 -0700)]
osdmap: reference the correct value in debug output
Looks like we've been printing out the (possibly-still-default-initialized)
num_osd member variable instead of the given nosd value! Luckily
I don't see any other misuse and we fill out
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
Greg Farnum [Tue, 6 Jun 2017 23:29:16 +0000 (16:29 -0700)]
cephtool/test: create an rbd pool since it's no longer automatic
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
Greg Farnum [Tue, 6 Jun 2017 23:00:37 +0000 (16:00 -0700)]
TestOSDMap: provide more flexibility in the PrimaryAffinity check
Fix the margins for the primary affinity test.
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
Greg Farnum [Mon, 5 Jun 2017 19:27:46 +0000 (12:27 -0700)]
osdmap: do not automatically create an rbd pool on cluster creation; skip pool 0
We don't use pool ID 0 any more because CephFS can't handle it.
Update the user quick-start to include it, and add some links to support that process.
Fix the tests to handle the new state of life.
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
Greg Farnum [Tue, 6 Jun 2017 22:29:15 +0000 (15:29 -0700)]
TestOSDMap: actually loop through the pools as intended
Looks like this was meant to be a loop but (unlike the other tests)
just referred to a constant pool 0. Whoops!
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
Greg Farnum [Tue, 6 Jun 2017 00:56:31 +0000 (17:56 -0700)]
pgmap: extend mon_pg_warn_min_objects to cover the PG-per-OSD warnings too
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
Greg Farnum [Wed, 14 Jun 2017 20:13:47 +0000 (13:13 -0700)]
src/jobs: remove these definitely-broken old testing scripts
They haven't been touched in 6 years and were considered broken then.
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
Haomai Wang [Wed, 28 Jun 2017 14:22:14 +0000 (22:22 +0800)]
Merge pull request #15967 from Adirl/continous
msg/async/rdma: register buffer as continuous
Reviewed-by: Haomai Wang <haomai@xsky.com>
Xie Rui [Thu, 22 Jun 2017 09:12:30 +0000 (17:12 +0800)]
fix infinite loop in rest api for log list
as max_entries_str is empty, it will be infinite loop when log is more than MAX_ENTRIES(1000) from marker.
and max_entries maybe overflow if use it to count the left entries.
Fixes: http://tracker.ceph.com/issues/20386
Signed-off-by: xierui <jerry.xr86@gmail.com>
Joao Eduardo Luis [Wed, 28 Jun 2017 12:36:02 +0000 (14:36 +0200)]
Merge pull request #14102 from renhwztetecs/renhw-wip-moninit-cleanup
mon: clean up in ceph_mon.cc
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Jos Collin <jcollin@redhat.com>
Adir Lev [Mon, 5 Jun 2017 12:19:55 +0000 (12:19 +0000)]
msg/async/rdma: register buffer as continuous
Change-Id: I1a715de28ace3ff8ae077ca783ad5060e7966d54
Signed-off-by: Adir Lev <adirl@mellanox.com>
Kefu Chai [Wed, 28 Jun 2017 02:04:50 +0000 (10:04 +0800)]
Merge pull request #15907 from tchaikov/wip-with-zfs
cmake: fix the build with -DWITH_ZFS=ON
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Haomai Wang [Wed, 28 Jun 2017 01:55:39 +0000 (09:55 +0800)]
Merge pull request #15908 from Adirl/twice
msg/async/rdma: use lists properly
Reviewed-by: Haomai Wang <haomai@xsky.com>
John Spray [Tue, 27 Jun 2017 21:59:32 +0000 (17:59 -0400)]
Merge pull request #15521 from dillaman/wip-rbd-dashboard
pybind/mgr/dashboard: initial block integration
Reviewed-by: John Spray <john.spray@redhat.com>
Sage Weil [Tue, 27 Jun 2017 19:13:53 +0000 (14:13 -0500)]
Merge pull request #15853 from liewegas/wip-simpler-ceph
qa/tasks/ceph: simplify ceph deployment slightly
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Tue, 27 Jun 2017 16:52:35 +0000 (12:52 -0400)]
qa/tasks/ceph: explicitly add osds to crush map for upgrades
Before kraken, ceph-osd didn't add itself to crush... ceph-osd-prestart.sh
did it. And ceph.py doesn't use that.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 27 Jun 2017 16:36:38 +0000 (11:36 -0500)]
Merge pull request #15955 from liewegas/wip-20431
qa/tasks/dump_stuck: fix for active+clean+remapped
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Tue, 27 Jun 2017 16:01:07 +0000 (12:01 -0400)]
qa/tasks/dump_stuck: fix for active+clean+remapped
In
d24a8886658c2d8882275d69c6409717a62701be we made remapped a clean
state but didn't fix this test.
Fixes: http://tracker.ceph.com/issues/20431
Signed-off-by: Sage Weil <sage@redhat.com>
Kefu Chai [Mon, 26 Jun 2017 03:58:28 +0000 (11:58 +0800)]
cmake: compile libzfs backend conditionally
* do not REQUIRE libzfs if it is enabled, this follows the way how we
handle `WITH_XFS` option.
* also refactor the cmake script related to libxfs backend support a
little bit.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Tue, 27 Jun 2017 15:22:42 +0000 (10:22 -0500)]
Merge pull request #15874 from elliswuuuuuuuu/remove_unuse_config
common/config_opt: remove unused config
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Tue, 27 Jun 2017 15:22:26 +0000 (10:22 -0500)]
Merge pull request #15864 from joscollin/wip-CID1412839-uninitialized-pointer-field
common: initialize array in struct BackTrace
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Tue, 27 Jun 2017 15:22:03 +0000 (10:22 -0500)]
Merge pull request #15881 from joscollin/wip-
1412776 -explicit-null-dereferenced
common: Passing null pointer option_name to operator << in md_config_t::parse_option()
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Tue, 27 Jun 2017 15:21:46 +0000 (10:21 -0500)]
Merge pull request #15896 from Yan-waller/wip-waller-mgrcleanup0624
mgr: drop repeated log info. and unnecessary write permission
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Tue, 27 Jun 2017 15:21:15 +0000 (10:21 -0500)]
Merge pull request #15910 from wido/cest-api-fork
ceph-rest-api: Various REST API fixes
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Tue, 27 Jun 2017 15:19:59 +0000 (10:19 -0500)]
Merge pull request #15915 from liupan1111/wip-add-perfs
src/OSD: add more useful perf counters for performance tuning.
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 27 Jun 2017 15:19:41 +0000 (10:19 -0500)]
Merge pull request #15917 from xiexingguo/wip-upmap-fixes
mon/OSDMonitor: a couple of upmap and other fixes
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 27 Jun 2017 15:19:22 +0000 (10:19 -0500)]
Merge pull request #15935 from zphj1987/master
ceph-conf: fix typo in usage: 'mon add' should be 'mon addr'
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Tue, 27 Jun 2017 15:03:12 +0000 (08:03 -0700)]
Merge pull request #15885 from liewegas/wip-radosbench-timeout
qa/tasks/radosbench: increase timeout
Reviewed-by: Yuri Weinstein <yweins@redhat.com>
Yuri Weinstein [Tue, 27 Jun 2017 15:01:02 +0000 (08:01 -0700)]
Merge pull request #15882 from rzarzynski/wip-20372
rgw: fixes for AWSBrowserUploadAbstractor auth
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 27 Jun 2017 15:00:12 +0000 (08:00 -0700)]
Merge pull request #15931 from cbodley/wip-rgw-slo-compression
rgw: use uncompressed size for range_to_ofs() in slo/dlo
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Casey Bodley [Tue, 27 Jun 2017 14:30:02 +0000 (10:30 -0400)]
Merge pull request #15928 from liewegas/wip-rgw-warning
rgw/rgw_op: fix whitespace and indentation warning
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Sage Weil [Tue, 27 Jun 2017 14:04:34 +0000 (09:04 -0500)]
Merge pull request #15920 from wido/docs-mgr-dashboard
docs: mgr dashboard
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: John Spray <jspray@redhat.com>
Adir Lev [Sun, 28 May 2017 13:11:54 +0000 (13:11 +0000)]
msg/async/rdma: avoid adding worker twice to pending_workers
Change-Id: I4dda9040a055bdb8787ffd23a6928925d0a69d83
Signed-off-by: Adir Lev <adirl@mellanox.com>
Adir lev [Sun, 28 May 2017 10:56:29 +0000 (13:56 +0300)]
msg/async/rdma: avoid adding csi twice to pending_list
Change-Id: Id76ffbfebc54c2da339e0e7f063c5420042fbe7c
Signed-off-by: Adir lev <adirl@mellanox.com>
Wido den Hollander [Mon, 26 Jun 2017 12:49:28 +0000 (14:49 +0200)]
doc: Mgr Dashboard docs update
More instructions on how to deploy the dashboard using ceph-mgr
Signed-off-by: Wido den Hollander <wido@42on.com>
Nathan Cutler [Mon, 26 Jun 2017 08:42:08 +0000 (10:42 +0200)]
tests: rgw.py: put client roles in a separate list
Fixes: http://tracker.ceph.com/issues/20417
Signed-off-by: Nathan Cutler <ncutler@suse.com>
huanwen ren [Tue, 27 Jun 2017 10:52:08 +0000 (18:52 +0800)]
mon: clean up in ceph_mon.cc
The output prints to the ceph-mon.log,
so need replace cout with dout,in addition, keep cout in the usage().
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
Mykola Golub [Tue, 27 Jun 2017 10:04:26 +0000 (13:04 +0300)]
Merge pull request #15919 from dillaman/wip-test-cls-rbd
test: fix compile warning in ceph_test_cls_rbd
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Abhishek L [Tue, 27 Jun 2017 05:45:36 +0000 (07:45 +0200)]
Merge pull request #15934 from myoungwon/omw-mailmap
mailmap: add Myoungwon Oh's mailmap and affiliation
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Kefu Chai [Tue, 27 Jun 2017 04:03:06 +0000 (12:03 +0800)]
Merge pull request #15914 from wjwithagen/remotes/origin/wip-wjw-freebsd-osd-scrub-repair-3
test/osd/osd-scrub-repair.sh: Fix diff options on FreeBSD
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Tue, 27 Jun 2017 03:47:58 +0000 (22:47 -0500)]
Merge pull request #15856 from cbodley/wip-rgw-vstart-s3tests
vstart: remove rgw_enable_static_website
Sage Weil [Tue, 27 Jun 2017 03:47:20 +0000 (22:47 -0500)]
Merge pull request #15863 from gmayyyha/paxosservice-use-func
mon/PaxosService: use __func__ instead of hard code function name
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Tue, 27 Jun 2017 02:25:43 +0000 (21:25 -0500)]
Merge pull request #15759 from ovh/bp-optimized-bs-key-escape
os/bluestore: optimized (encode|decode)_escaped
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 27 Jun 2017 02:25:26 +0000 (21:25 -0500)]
Merge pull request #15765 from jimmyway/wip-ec-plan-cleanup
osd/ECTransaction: cleanup the redundant check which works in overwrite IO context
Reviewed-by: Sage Weil <sage@redhat.com>
Peng Zhang [Tue, 27 Jun 2017 01:18:56 +0000 (09:18 +0800)]
ceph-conf: fix typo in usage: 'mon add' should be 'mon addr'
src/test/cli/ceph-conf/help.t
src/tools/ceph_conf.cc
fix add to addr
Signed-off-by: Peng Zhang zphj1987@gmail.com
myoungwon oh [Tue, 27 Jun 2017 01:08:24 +0000 (10:08 +0900)]
mailmap: add Myoungwon Oh's mailmap and affiliation
Signed-off-by: Myoungwon Oh <omwmw@sk.com>
Casey Bodley [Mon, 26 Jun 2017 19:52:47 +0000 (15:52 -0400)]
rgw: use uncompressed size for range_to_ofs() in slo/dlo
Signed-off-by: Casey Bodley <cbodley@redhat.com>
Sage Weil [Mon, 26 Jun 2017 19:48:16 +0000 (15:48 -0400)]
rgw/rgw_op: fix some more whitespace
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 26 Jun 2017 19:47:38 +0000 (15:47 -0400)]
rgw/rgw_op: fix indentation warning
/home/sage/src/ceph2/src/rgw/rgw_op.cc: In member function ‘virtual void RGWDeleteObjTags::execute()’:
/home/sage/src/ceph2/src/rgw/rgw_op.cc:777:3: warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
if (s->object.empty())
^~
/home/sage/src/ceph2/src/rgw/rgw_op.cc:780:5: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ‘if’
rgw_obj obj;
^~~~~~~
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 23 Jun 2017 15:12:01 +0000 (11:12 -0400)]
qa/tasks/radosbench: increase timeout
The current timeout isn't enough in some cases (powercycle thrashing leaves
osds down for a long time because rebooting is so slow).
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 26 Jun 2017 18:40:16 +0000 (13:40 -0500)]
Merge pull request #14997 from ivancich/wip-bring-in-dmclock-p2
osd/PG: Add two new mClock implementations of the PG sharded operator queue
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Casey Bodley [Mon, 26 Jun 2017 18:14:20 +0000 (14:14 -0400)]
Merge pull request #15569 from aclamk/compress_crash_bug_refactor
rgw: Compress crash bug refactor
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Zack Cerza [Mon, 26 Jun 2017 16:16:42 +0000 (10:16 -0600)]
Merge pull request #15859 from smithfarm/wip-swift-task-move-master
tests: move swift.py task from teuthology to ceph, phase one (master)
Kefu Chai [Mon, 26 Jun 2017 16:08:04 +0000 (00:08 +0800)]
Merge pull request #15555 from liewegas/wip-19023
osd/PG: set clean when last_epoch_clean is updated
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Kefu Chai [Mon, 26 Jun 2017 15:56:28 +0000 (23:56 +0800)]
Merge pull request #15862 from yuyuyu101/wip-omap-enoent
kv/RocksDBStore: abort if rocksdb EIO, don't return incorrect result
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Mon, 26 Jun 2017 15:56:02 +0000 (23:56 +0800)]
Merge pull request #15866 from tchaikov/wip-set-secrets
auth/RotatingKeyRing: use std::move() to set secrets
Reviewed-by: Sage Weil <sage@redhat.com>
Kefu Chai [Mon, 26 Jun 2017 15:53:21 +0000 (23:53 +0800)]
Merge pull request #15905 from tchaikov/wip-kill-clang-warnings
test, ceph-osdomap-tool: kill clang warnings
Reviewed-by: Sage Weil <sage@redhat.com>
Pan Liu [Mon, 26 Jun 2017 15:43:23 +0000 (23:43 +0800)]
src/OSD: add more useful perf counters for performance tuning.
Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
Casey Bodley [Mon, 26 Jun 2017 13:14:05 +0000 (09:14 -0400)]
Merge pull request #13753 from theanalyst/wip/f/rgw/tagging
rgw: implement get/put object tags for S3
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Jason Dillaman [Mon, 26 Jun 2017 13:08:08 +0000 (09:08 -0400)]
Merge pull request #15889 from joscollin/wip-
1412614 -uninitialized-scalar-field
tools/rbd_mirror: initialize non-static class member m_do_resync in ImageReplayer
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Mon, 26 Jun 2017 12:57:37 +0000 (08:57 -0400)]
test: fix compile warning in ceph_test_cls_rbd
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
xie xingguo [Sat, 24 Jun 2017 08:12:05 +0000 (16:12 +0800)]
mon/OSDMonitor: add use_gmt_hitset to "osd pool get" cmd filter
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
xie xingguo [Sat, 24 Jun 2017 07:52:05 +0000 (15:52 +0800)]
mon/OSDMonitor: drop debug_fake_ec_pool from "osd pool set" cmd filter
It is dead!
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
xie xingguo [Sat, 24 Jun 2017 07:38:49 +0000 (15:38 +0800)]
mon/OSDMonitor: fix wrong sanity check order for allow_ec_overwrites
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
xie xingguo [Sat, 24 Jun 2017 06:50:57 +0000 (14:50 +0800)]
mon/OSDMonitor: make blacklist expire configurable; fix potential races
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
xie xingguo [Sat, 24 Jun 2017 06:10:42 +0000 (14:10 +0800)]
mon/OSDMonitor: fix wrong comment, wrong indention, wrong output etc.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
xie xingguo [Sat, 24 Jun 2017 06:05:59 +0000 (14:05 +0800)]
mon/OSDMonitor: strict comparison condition
To match the specifications of straw_calc_version.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
xie xingguo [Sat, 24 Jun 2017 04:13:15 +0000 (12:13 +0800)]
osd/osd_type: map.find() -> map.count() for existense checking
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
xie xingguo [Sat, 24 Jun 2017 04:09:17 +0000 (12:09 +0800)]
mon/OSDMonitor: kill dead code
This option is now filtered out automatically, so these codes are unaccessable.
./bin/ceph osd unset sortbitwise
Invalid command: sortbitwise not in full|pause|noup|nodown|noout|noin|nobackfill|norebalance|norecover|noscrub|nodeep-scrub|notieragent
osd unset full|pause|noup|nodown|noout|noin|nobackfill|norebalance|norecover|noscrub|nodeep-scrub|notieragent : unset <key>
Error EINVAL: invalid command
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
xie xingguo [Sat, 24 Jun 2017 03:36:15 +0000 (11:36 +0800)]
mon/OSDMonitor: make pg-up-items result a bit nicer
~#: ./bin/ceph osd pg-upmap-items 0.7 0 2 1 3 4 5
set 0.7 pg_upmap_items mapping to [0->2,1->3,4->5]
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
xie xingguo [Sat, 24 Jun 2017 03:31:16 +0000 (11:31 +0800)]
mon/OSDMonitor: reject updating upmap if number of osd overflows/underflows
This can avoid, e.g.:
~#:./bin/ceph osd pg-upmap 0.7 1 2 3 4
set 0.7 pg_upmap mapping to [1,2,3,4]
~#:./bin/ceph pg dump
PG_STAT OBJECTS MISSING_ON_PRIMARY DEGRADED MISPLACED UNFOUND BYTES LOG DISK_LOG STATE STATE_STAMP VERSION REPORTED UP UP_PRIMARY ACTING ACTING_PRIMARY LAST_SCRUB SCRUB_STAMP LAST_DEEP_SCRUB DEEP_SCRUB_STAMP
0.7 0 0 0 0 0 0 0 0 peering 2017-06-24 10:11:03.938102 0'0 53:18 [1,2,3,4] 1 [1,2,3,4] 1 0'0 2017-06-24 09:38:50.162197 0'0 2017-06-24 09:38:50.162197
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
xie xingguo [Sat, 24 Jun 2017 01:55:24 +0000 (09:55 +0800)]
osd/OSDMap: make apply_upmap handle multiple pg-upmap-items correctly
Was:
PG_STAT UP UP_PRIMARY ACTING ACTING_PRIMARY
0.7 [1,0,4] 1 [1,0,4] 1
~#:./bin/ceph osd pg-upmap-items 0.7 0 2 1 3 4 5
set 0.7 pg_upmap_items mapping to [0,2,1,3,4,5]
PG_STAT UP UP_PRIMARY ACTING ACTING_PRIMARY
0.7 [1,2,4] 1 [1,2,4] 1
Now:
PG_STAT UP UP_PRIMARY ACTING ACTING_PRIMARY
0.7 [1,0,4] 1 [1,0,4] 1
~#:./bin/ceph osd pg-upmap-items 0.7 0 2 1 3 4 5
set 0.7 pg_upmap_items mapping to [0,2,1,3,4,5]
PG_STAT UP UP_PRIMARY ACTING ACTING_PRIMARY
0.7 [3,2,5] 3 [3,2,5] 3
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Willem Jan Withagen [Mon, 26 Jun 2017 11:23:59 +0000 (13:23 +0200)]
test/osd/osd-scrub-repair.sh: Fix diff options
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>