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
Wido den Hollander
3f0428ac3a
rest api: Set application variable when not executed as __main__
...
This allows for using this Python file as a WSGI module as it expects
a variable called application.
Signed-off-by: Wido den Hollander <wido@42on.com>
2017-06-26 11:50:50 +02:00
Wido den Hollander
00346f6887
rest api: Set default ceph.conf and id options
...
This allows for easy execution of the REST API:
$ /usr/bin/ceph-rest-api
Signed-off-by: Wido den Hollander <wido@42on.com>
2017-06-26 11:50:34 +02:00
Wido den Hollander
38ea74823a
rest api: Listen on :: (IPv6) instead of 0.0.0.0
...
On Linux systems a socket listening on :: also listens on
all IPv4 addresses.
This makes sure the API is usable over IPv6 as well.
Signed-off-by: Wido den Hollander <wido@42on.com>
2017-06-26 11:46:58 +02:00
Jos Collin
61cde7a0fa
common: Passing null pointer option_name to operator << in md_config_t::parse_option()
...
Fixes the Coverity Scan Report:
CID 1412776 (#1 of 1): Explicit null dereferenced (FORWARD_NULL)19. var_deref_model: Passing null pointer option_name to operator <<, which dereferences it.
Fixed the review comments too in this commit.
Signed-off-by: Jos Collin <jcollin@redhat.com>
2017-06-26 14:48:05 +05:30
Adam Kupczyk
9187c773d7
radosgw: refactor compression code
...
Signed-off-by: Adam Kupczyk <akupczyk@mirantis.com>
2017-06-26 05:00:43 -04:00
Adam Kupczyk
90971552b2
radosgw, compression: added unit test
...
Signed-off-by: Adam Kupczyk <akupczyk@mirantis.com>
2017-06-26 04:55:57 -04:00
fang.yuxiang
5da8e92469
rgw: connection reset/crashed when download large zero object with compression enable
...
large zero object has a large compression rate,
even 4M compressed data can decompress several GB data.
Handle so much data in single process lead strange issue.
Fixes: http://tracker.ceph.com/issues/20098
Signed-off-by: fang yuxiang fang.yuxiang@eisoo.com
2017-06-26 04:55:57 -04:00
Kefu Chai
e34e22b6ef
os/ZFS: make it compilable
...
* `cct` is not globally avaiable, use cct() wrapper instead
* libzfs.h is always avaiable here. so remove the guard
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-26 12:06:06 +08:00
Kefu Chai
9638fdb15b
Merge pull request #15445 from wjwithagen/wip-wjw-freebsd-osd-scrub-repair-2
...
test/osd/osd-scrub-repair.sh: disable ec_overwrite tests on FreeBSD
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-26 10:14:10 +08:00
Yan Jun
d26bca09cf
mgr: drop unnecessary write permission
...
Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
2017-06-26 10:07:26 +08:00
Yan Jun
455589906c
mgr: use readable errno strings
...
Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
2017-06-26 10:07:25 +08:00
Jos Collin
0d1e19722e
Merge pull request #15902 from joscollin/wip-1411820-Division-or-modulo-by-zero
...
test: Division by zero in Legacy::encode_n()
Reviewed By: Brad Hubbard <bhubbard@redhat.com>
2017-06-26 01:30:57 +00:00
Kefu Chai
4bcc03721a
ceph-osdomap-tool: early return and remove never-read store statement
...
* silence clang analyzer's warning of: "Value stored to 'r' is never
read"
* replace the "goto" statement with early return to improve the
readability
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-25 23:00:05 +08:00
Haomai Wang
bad5908dfe
Merge pull request #15903 from Adirl/data_path_fixes
...
msg/async/rdma: Data path fixes
Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-06-25 22:52:02 +08:00
Kefu Chai
9cc0cf4979
test/test_async_driver: silence clang static analyzer warning
...
* silence the warning of: Value stored to 'r' is never read
* update the gtest assertions to be semantically more correct.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-25 22:51:09 +08:00
Nathan Cutler
2bc0c7c617
tests: swift.py: tweak imports
...
The ".." form only works within the teuthology repo. With swift.py now in the
Ceph repo, we have to be explicit.
Error message was: "ValueError: Attempted relative import beyond toplevel
package
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-06-25 12:42:36 +02:00
Jos Collin
28cf5ac8b0
test: Division by zero in Legacy::encode_n()
...
Fixes the Coverity Scan Report:
CID 1411820 (#1 of 1): Division or modulo by zero (DIVIDE_BY_ZERO)
9. divide_by_zero: In expression bl.length() * i / sum, division by expression sum which may be zero has undefined behavior.
Signed-off-by: Jos Collin <jcollin@redhat.com>
2017-06-25 11:47:41 +05:30
Sage Weil
c340b7166a
Merge pull request #15826 from xiexingguo/wip-bluestore-20170622
...
os/bluestore: cleanup min_alloc_size; some formatting nits
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
2017-06-24 23:21:50 -05:00
Sage Weil
cf206cc35c
Merge pull request #15865 from tchaikov/wip-mgr-pg-command
...
mgr: enable ceph_send_command() to send pg command
Reviewed-by: John Spray <john.spray@redhat.com>
2017-06-24 23:21:27 -05:00
Sage Weil
4e9fd2ae8d
Merge pull request #15875 from xiexingguo/wip-osdmon-20170623
...
mon/OSDMonitor: "osd crush class rename" support
Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-24 23:21:02 -05:00
Sage Weil
82fcdd9175
Merge pull request #15890 from tchaikov/wip-19741
...
osdc/Objecter: release message if it's not handled
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-06-24 23:20:38 -05:00
Sage Weil
4e6af859a0
Merge pull request #15891 from minggr/wip-sdata_op_ordering_lock
...
osd: unlock sdata_op_ordering_lock with sdata_lock hold to avoid miss…
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-06-24 23:20:19 -05:00
Sage Weil
f0ceefbcc4
Merge pull request #15899 from theanalyst/doc/release-typo
...
doc: Luminous release notes typo fixes
2017-06-24 23:16:57 -05:00
Jos Collin
8ebb13e9e1
Merge pull request #15901 from joscollin/wip-CID1412577-Division-or-modulo-by-float-zero
...
mon: Division by zero in PGMapDigest::dump_pool_stats_full()
Reviewed By: Xie Xingguo <xie.xingguo@zte.com.cn>
2017-06-25 04:10:32 +00:00