Sage Weil
fe4d15191d
Merge pull request #15874 from elliswuuuuuuuu/remove_unuse_config
...
common/config_opt: remove unused config
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-27 10:22:42 -05:00
Sage Weil
63c29d4358
Merge pull request #15864 from joscollin/wip-CID1412839-uninitialized-pointer-field
...
common: initialize array in struct BackTrace
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-27 10:22:26 -05:00
Sage Weil
6f6d6ed984
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>
2017-06-27 10:22:03 -05:00
Sage Weil
ba734f34e8
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>
2017-06-27 10:21:46 -05:00
Sage Weil
e8fc74d677
Merge pull request #15910 from wido/cest-api-fork
...
ceph-rest-api: Various REST API fixes
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-27 10:21:15 -05:00
Sage Weil
e57dd54cb9
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>
2017-06-27 10:19:59 -05:00
Sage Weil
f6087a34e8
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>
2017-06-27 10:19:41 -05:00
Sage Weil
98d21bdf7a
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>
2017-06-27 10:19:22 -05:00
Yuri Weinstein
c1b92ea9a5
Merge pull request #15885 from liewegas/wip-radosbench-timeout
...
qa/tasks/radosbench: increase timeout
Reviewed-by: Yuri Weinstein <yweins@redhat.com>
2017-06-27 08:03:12 -07:00
Yuri Weinstein
a73f81bedd
Merge pull request #15882 from rzarzynski/wip-20372
...
rgw: fixes for AWSBrowserUploadAbstractor auth
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-06-27 08:01:02 -07:00
Yuri Weinstein
8d42ecd3b7
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>
2017-06-27 08:00:12 -07:00
Casey Bodley
c30b28f1b2
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>
2017-06-27 10:30:02 -04:00
Sage Weil
7f3a73baf5
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>
2017-06-27 09:04:34 -05:00
Wido den Hollander
0f15e4e76b
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>
2017-06-27 15:42:41 +02:00
Mykola Golub
a23c7e5505
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>
2017-06-27 13:04:26 +03:00
Abhishek L
eda363edca
Merge pull request #15934 from myoungwon/omw-mailmap
...
mailmap: add Myoungwon Oh's mailmap and affiliation
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
2017-06-27 07:45:36 +02:00
Kefu Chai
51601f57db
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>
2017-06-27 12:03:06 +08:00
Sage Weil
969113d7bf
Merge pull request #15856 from cbodley/wip-rgw-vstart-s3tests
...
vstart: remove rgw_enable_static_website
2017-06-26 22:47:58 -05:00
Sage Weil
0dedf91436
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>
2017-06-26 22:47:20 -05:00
Sage Weil
94f0cd4b27
Merge pull request #15759 from ovh/bp-optimized-bs-key-escape
...
os/bluestore: optimized (encode|decode)_escaped
Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-26 21:25:43 -05:00
Sage Weil
04377fdd8b
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>
2017-06-26 21:25:25 -05:00
Peng Zhang
15736389ea
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
2017-06-27 09:18:56 +08:00
myoungwon oh
6eda8814bb
mailmap: add Myoungwon Oh's mailmap and affiliation
...
Signed-off-by: Myoungwon Oh <omwmw@sk.com>
2017-06-27 10:08:24 +09:00
Casey Bodley
729f687a13
rgw: use uncompressed size for range_to_ofs() in slo/dlo
...
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-06-26 16:12:08 -04:00
Sage Weil
cb57eccb41
rgw/rgw_op: fix some more whitespace
...
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-26 15:48:16 -04:00
Sage Weil
075368d89a
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>
2017-06-26 15:47:38 -04:00
Sage Weil
dfa95db57d
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>
2017-06-26 15:09:19 -04:00
Sage Weil
d96491b3ac
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>
2017-06-26 13:40:16 -05:00
Casey Bodley
e3d59601ef
Merge pull request #15569 from aclamk/compress_crash_bug_refactor
...
rgw: Compress crash bug refactor
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-06-26 14:14:20 -04:00
Zack Cerza
5442b5ff25
Merge pull request #15859 from smithfarm/wip-swift-task-move-master
...
tests: move swift.py task from teuthology to ceph, phase one (master)
2017-06-26 10:16:42 -06:00
Kefu Chai
0780f9e678
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>
2017-06-27 00:08:04 +08:00
Kefu Chai
203ee0e25c
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>
2017-06-26 23:56:28 +08:00
Kefu Chai
d9e428884f
Merge pull request #15866 from tchaikov/wip-set-secrets
...
auth/RotatingKeyRing: use std::move() to set secrets
Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-26 23:56:02 +08:00
Kefu Chai
e34a37999a
Merge pull request #15905 from tchaikov/wip-kill-clang-warnings
...
test, ceph-osdomap-tool: kill clang warnings
Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-26 23:53:21 +08:00
Pan Liu
639ea28a2d
src/OSD: add more useful perf counters for performance tuning.
...
Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
2017-06-26 23:43:23 +08:00
Casey Bodley
5977372715
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>
2017-06-26 09:14:05 -04:00
Jason Dillaman
f43c5fa055
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>
2017-06-26 09:08:08 -04:00
Jason Dillaman
219ee898f6
test: fix compile warning in ceph_test_cls_rbd
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-06-26 08:57:37 -04:00
xie xingguo
869c515355
mon/OSDMonitor: add use_gmt_hitset to "osd pool get" cmd filter
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-06-26 20:23:29 +08:00
xie xingguo
6ccb36837d
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>
2017-06-26 20:23:29 +08:00
xie xingguo
dfcb403a00
mon/OSDMonitor: fix wrong sanity check order for allow_ec_overwrites
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-06-26 20:23:28 +08:00
xie xingguo
9205dd2059
mon/OSDMonitor: make blacklist expire configurable; fix potential races
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-06-26 20:23:28 +08:00
xie xingguo
c4923a7603
mon/OSDMonitor: fix wrong comment, wrong indention, wrong output etc.
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-06-26 20:23:28 +08:00
xie xingguo
412105bb5a
mon/OSDMonitor: strict comparison condition
...
To match the specifications of straw_calc_version.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-06-26 20:23:28 +08:00
xie xingguo
3084220779
osd/osd_type: map.find() -> map.count() for existense checking
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-06-26 20:23:28 +08:00
xie xingguo
7438723389
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>
2017-06-26 20:23:27 +08:00
xie xingguo
dc797a255e
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>
2017-06-26 20:23:26 +08:00
xie xingguo
87081d58e5
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>
2017-06-26 20:23:26 +08:00
xie xingguo
d816e71c59
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>
2017-06-26 20:23:25 +08:00
Willem Jan Withagen
9996dab4f5
test/osd/osd-scrub-repair.sh: Fix diff options
...
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-06-26 13:23:59 +02:00