Commit Graph

76456 Commits

Author SHA1 Message Date
Jason Dillaman
9b3fe6f03b Merge pull request #16583 from lxbsz/ws_macro
librbd: add LIBRBD_SUPPORTS_WRITESAME support

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-07-31 09:49:13 -04:00
John Spray
f8068cd438 mon: extensible output format for health checks
The summary field can be extended with the fields
used to construct the message (e.g. including
the down osd count in the message about osds
being down).

The detail entries, similarly, can be extended
with machine-readable fields like the PG ID
for a damaged PG.

For the moment all the internal stuff is just
strings still, but we change the output format
so that we don't break it later when we
add things.

Signed-off-by: John Spray <john.spray@redhat.com>
2017-07-31 09:33:12 -04:00
John Spray
ac01dff6a9 osd/mon/mds: fix config set tell command
This was working for setting values, but failing to call
the config observers, so some values didn't take effect.

Fixes: http://tracker.ceph.com/issues/20803
Signed-off-by: John Spray <john.spray@redhat.com>
2017-07-31 09:28:21 -04:00
Yan Jun
b3b1f2cfb2 cls/rbd: silence warning from -Wunused-variable
Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
2017-07-31 21:26:13 +08:00
Jason Dillaman
51c7cec7bb Merge pull request #16694 from Songweibin/wip-doc-rbd
rbd: modified some commands' description into imperative sentence

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-07-31 09:12:27 -04:00
Willem Jan Withagen
9667222d98 HashIndex.cc: add compat.h for ENODATA
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-07-31 15:02:53 +02:00
Kefu Chai
8bc029b6af mon/OSDMonitor: assert(pg in creating_pgs.pg) in send_pg_creates()
and mark OSDMonitor::send_pg_creates() a const method.

See-also: http://tracker.ceph.com/issues/20785
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-07-31 20:58:58 +08:00
Jason Dillaman
a2857c8181 Merge pull request #16686 from amitkumar50/cov-1351525-1
rbd: fixed coverity 'Argument cannot be negative' warning

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-07-31 08:53:40 -04:00
Kefu Chai
9dc53c276f cmake: disable -fvar-tracking-assignments for config.cc
there are too many variables involved in config.cc, but
-fvar-tracking-assignments is enabled by default, when the compiler
finds that the number of variables exceeds the limit
"max-vartrack-size", it gives up, and tries again disabling this
option.

this change avoids the recompilation of config.cc and also
silences the warning of

src/common/config.cc:77:1: note: variable tracking size limit exceeded
with -fvar-tracking-assignments, retrying without
 md_config_t::md_config_t(bool is_daemon)
 ^

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-07-31 20:34:26 +08:00
amitkuma
01fe317d02 rbd: 1351525 Argument cannot be negative
Fixed:

** CID 1351525 (#1 of 1): Argument cannot be negative (NEGATIVE_RETURNS)
7. negative_returns: sd is passed to a parameter that cannot be negative.

Signed-off-by: Amit Kumar amitkuma@redhat.com
2017-07-31 17:58:32 +05:30
songweibin
f9a94641e5 rbd: modified some commands' description into imperative sentence
Signed-off-by: songweibin <song.weibin@zte.com.cn>
2017-07-31 20:25:30 +08:00
Orit Wasserman
25cef9a097 rgw: Fix up to 1000 entries at a time in check_bad_index_multipart
Fixes: http://tracker.ceph.com/issues/20772
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2017-07-31 14:51:27 +03:00
Luo Kexue
e22a91290d rgw: remove some unused variable
Signed-off-by: Luo Kexue <luo.kexue@zte.com.cn>
2017-07-31 19:40:12 +08:00
John Spray
cbd2e303e9 doc: update client.admin key refs to "mds 'allow'"
This is more correctly "mds 'allow *'".

In the RADOS user management page, refer the user
to the cephfs client auth docs, rather than attempting
to explain MDS cap syntax inline.

Signed-off-by: John Spray <john.spray@redhat.com>
2017-07-31 11:58:29 +01:00
John Spray
fa70335db2 Merge pull request #16660 from nrdmn/patch-2
doc: added mgr caps to manual deployment documentation

Reviewed-by: John Spray <john.spray@redhat.com>
2017-07-31 11:53:53 +01:00
Pritha Srivastava
358045a032 rgw: Fix for Policy Parse exception in case of multiple statements.
Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
2017-07-31 12:18:38 +05:30
liuchang0812
3f5d51ac3c os/bluestore: clear result in BlueRocksEnv::getChildren
see https://github.com/facebook/rocksdb/blob/master/env/env_posix.cc#L492. in
rocksdb::env_posix implementation, it will always clear result at first. We will
get a core dump when we use rocksdb::RepairDB if we do not clear result.

Fixes: http://tracker.ceph.com/issues/20857

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
2017-07-31 13:20:45 +08:00
Kefu Chai
7df9ab607f pybind/rados: use new APIs instead of deprecated ones
s/rados_read_op_omap_get_vals/rados_read_op_omap_get_vals2/
s/rados_read_op_omap_get_keys/rados_read_op_omap_get_keys2/

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-07-31 12:31:59 +08:00
Luo Kexue
e8cf00e8e5 auth: Remove unused function in AuthSessionHandler
Signed-off-by: Luo Kexue <luo.kexue@zte.com.cn>
2017-07-31 08:16:08 +08:00
Kefu Chai
729cf44679 Merge pull request #16627 from liewegas/wip-objecter-eagain
osdc/Objecter: unify disparate EAGAIN handling paths into one

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2017-07-30 15:33:52 +08:00
Kefu Chai
4357837c7e Merge pull request #16668 from Yan-waller/wip-walle-0729configoption
common: fix Option set_long_description

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-30 13:18:10 +08:00
mychoxin
ba26907d71 print more information when run ceph-osd with 'chech options'
Signed-off-by: mychoxin <mychoxin@gmail.com>
2017-07-30 12:28:41 +08:00
Kefu Chai
0b54fd90df mon/OSDMonitor: more verbose message for pg creation
See-also: http://tracker.ceph.com/issues/20785
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-07-30 11:17:15 +08:00
Kefu Chai
4584bff33f osd: do not send pg_created unless luminous
See-also: http://tracker.ceph.com/issues/20785
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-07-30 11:17:06 +08:00
xie xingguo
4736037394 crush: clean up get_immediate_parent_id()
This is a follow-up cleanup of 9d908c14f6

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-29 19:46:28 +08:00
xie xingguo
0f23574234 crush: avoid implicitly cast
pool-id may overflow(though actually can not happen...)

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-29 16:58:50 +08:00
xie xingguo
7974a0fd95 mon/OSDMonitor: make error output more human-readable
Was:

./bin/ceph osd crush weight-set reweight rbd osd.0  1 2 3 4 5
Error ENOENT: weight_set_size != 5 for bucket -1weight_set_size != 5 for bucket -2weight_set_size != 5 for bucket -3weight_set_size != 5 for bucket -4item 0 not found in crush map

Now:
./bin/ceph osd crush weight-set reweight rbd osd.0  1 2 3 4 5
Error EINVAL: must specify exact 3 weight values

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-29 16:58:50 +08:00
Xie Xingguo
a977599cae Merge pull request #16669 from Yan-waller/wip-walle-0729testpglogcompile
test/osd: kill compile warning

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-29 13:44:31 +08:00
Yan Jun
7e45879640 test/osd: kill compile warning
Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
2017-07-29 11:23:11 +08:00
Kefu Chai
4694cf402f Merge pull request #16667 from tchaikov/wip-objclass-omap
objclass: modify omap_get_{keys,vals} api

Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-29 11:10:38 +08:00
Yan Jun
2e04b7e9b9 common: fix Option set_long_description
Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
2017-07-29 10:21:43 +08:00
Yehuda Sadeh
57cae0a689 librados_test_stub: use omap_get_vals2() and modify stubs
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-07-29 10:15:40 +08:00
Yehuda Sadeh
bcac5666e3 cls_kvs: adjust objclass api
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2017-07-29 10:13:33 +08:00
Yehuda Sadeh
d3de6f5e07 cls_{rbd, journal, lua}: adjust api
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2017-07-29 10:13:33 +08:00
Yehuda Sadeh
d5f3b87079 cls/lua: add 'more' param for cls_cxx_map_get_vals()
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2017-07-29 10:13:33 +08:00
Yehuda Sadeh
5334622a83 cls/*: adjust use of cls_cxx_map_get_vals()
Now that objclass call gets a new 'more' param.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2017-07-29 10:13:33 +08:00
Yehuda Sadeh
149bd84891 objclass: add 'more' param to omap listing
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2017-07-29 10:13:33 +08:00
Jason Dillaman
ea33368c1e osd: cmpext operator should ignore -ENOENT on read
The operator already handles the case where the object is truncated. If
an RBD user performs a read + cmpext/write of a sparse image, the read
of the missing object would return a zeroed buffer. Using that zeroed
buffer for the cmpext test would fail since it wasn't ignoring the
-ENOENT read failure.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-07-28 19:07:13 -04:00
David Zafman
e03e731abc osd: EC read handling: don't grab an objectstore error to use as the read error
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-07-28 15:23:53 -07:00
Josh Durgin
06243931ad Merge pull request #16617 from dillaman/wip-20783
osd: moved OpFinisher logic from OSDOp to OpContext

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-28 15:07:17 -07:00
Yuri Weinstein
659a63f7af Merge pull request #16590 from LianneWang/master
ceph_test_rados: max_stride_size must be more than min_stride_size

Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-28 15:02:13 -07:00
Yuri Weinstein
26d120d83d Merge pull request #16615 from tchaikov/wip-no-vla-in-cxx
kv/RocksDBStore: use vector instead of VLA for holding slices

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
2017-07-28 15:01:46 -07:00
Gregory Farnum
dce8e7da86 Merge pull request #16655 from liewegas/wip-osd-warning
osd/PG: fix warning so we discard_event() on a no-op state change

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2017-07-28 12:52:39 -07:00
amitkuma
eb9a93b053 rgw: Assign instead of compare
Fixed:

** CID 1409697 (#1 of 1): Assign instead of compare (PW.ASSIGN_WHERE_COMPARE_MEANT)
1. assign_where_compare_meant: use of "=" where "==" may have been intended
2. primary_file: During compilation of file '/src/rgw/librgw.cc'

Signed-off-by: Amit Kumar amitkuma@redhat.com
2017-07-29 00:14:29 +05:30
Nick Erdmann
987024567c added mgr caps to manual deployment documentation
Signed-off-by: Nick Erdmann <n@nirf.de>
2017-07-28 19:16:27 +02:00
Patrick Donnelly
019f20ff98
Merge PR #16640 into master
* refs/remotes/upstream/pull/16640/head:
	qa: fix wait for wrong health message

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-07-28 09:55:49 -07:00
Patrick Donnelly
adce2308d3
Merge PR #16550 into master
* refs/remotes/upstream/pull/16550/head:
	cephfs/ceph-fuse: add and modify ceph-fuse mount hint

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-07-28 09:55:26 -07:00
Patrick Donnelly
6fc2ee383f
Merge PR #16413 into master
* refs/remotes/upstream/pull/16413/head:
	qa/cephfs: lsof if umount fails

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-07-28 09:55:23 -07:00
Patrick Donnelly
8ad8607256
Merge PR #16410 into master
* refs/remotes/upstream/pull/16410/head:
	mds: refuse 'export dir' request when mds is stopping

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-07-28 09:55:21 -07:00
Sage Weil
1e9452c2d6 osd/PG: fix warning
Introduced by 4af49a8866

Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-28 10:07:23 -04:00