Commit Graph

75963 Commits

Author SHA1 Message Date
Jason Dillaman
b9127e7e3e mgr/MgrClient: do not attempt to access a global variable for config
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-07-24 18:17:59 -04:00
Jason Dillaman
f7cae17559 librados: add missing implementations for C service daemon API methods
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-07-24 17:59:33 -04:00
Sage Weil
f347ef54c2 qa/workunits/cephtool/test.sh: disable 'fs status' until bug is fixed
See http://tracker.ceph.com/issues/20761
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-24 16:54:13 -04:00
Sage Weil
6b2458065e deb,rpm: require socat for ceph-test
Used by qa/standalone/mon/mon-bind.sh.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-24 15:44:51 -04:00
Sage Weil
e364a479ae unittest_compression: speed it up
~4m -> ~25s

Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-24 15:44:51 -04:00
Sage Weil
2e5955212d qa/tasks/workunit: allow alt basedir
Instead of 'qa/workunits' allow something like 'qa/standalone'.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-24 15:44:51 -04:00
Sage Weil
0e41fb2d97 ceph: drop --admin-socket warning/error on ceph cli
'ceph daemon' has existed for a long time; this has outlived its
usefullness.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-24 15:44:51 -04:00
Casey Bodley
1559e5a648 rgw: restore admin socket path in mrgw.sh
ceph-conf was rejecting the entity name with:

error parsing 'radosgw.8000': expected string of the form TYPE.ID, valid
types are: auth, mon, osd, mds, mgr, client

these mstart/mrun/mrgw scripts carefully place their output files under
their respective run/<cluster-name>/out subdirectory to keep them from
clashing

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-07-24 15:21:09 -04:00
Sage Weil
a627f24345 osd: populate last_epoch_split during build_initial_pg_history
If we get a pg create and have to generate the pg_history_t fields,
populate the last_epoch_split field too.  This is needed discard ops sent
from before the last split.  Specifically, PG::can_discard_op() looks at
it when the client has the RESEND_ON_SPLIT feature bit.  If we don't
discard, we may run afoul of assertions later (e.g., that the object
belongs to the PG at all) or potentially process an op out of order.

Fixes: http://tracker.ceph.com/issues/20754
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-24 14:21:33 -04:00
Sage Weil
26051db716 Merge pull request #16399 from batrick/cephfs-ptl-change
AUTHORS: update CephFS PTL

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
2017-07-24 12:48:02 -05:00
Patrick Donnelly
f5bd6f09b5
doc: update CephFS PTL
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-07-24 10:43:45 -07:00
Sage Weil
02c2e853d3 Merge pull request #16509 from liewegas/wip-rgw-wait
qa/suits/rados/basic/tasks/rgw_snaps: wait for pools to be created

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-07-24 11:55:54 -05:00
Josh Durgin
fca89877eb osd/PGLog: fix inaccurate missing assert
Repair and EIO handling can add missing items after log.tail

Fixes: http://tracker.ceph.com/issues/20753
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2017-07-24 12:55:02 -04:00
Kefu Chai
4373ea69e2 ceph-disk: s|/dev/fd/0|-|
3a4931b allows ceph cli to use '-' to denote stdin/stdout, so use it
instead of /dev/fd/0.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-07-25 00:21:05 +08:00
Kefu Chai
05da6d34be doc/dev/ceph-disk: add docs for ceph-disk
we might want to move part of it to user-facing docs.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-07-25 00:21:05 +08:00
Sage Weil
126cf70c85 Merge pull request #16437 from tchaikov/wip-doc-fixes
doc: update ceph(8) man page with new sub-commands

Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-24 11:02:54 -05:00
Yuri Weinstein
b4c42f39eb Merge pull request #16417 from fangyuxiangGL/rgw-hang
rgw: fix rgw hang when do RGWRealmReloader::reload after go SIGHUP

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-07-24 08:30:38 -07:00
Yuri Weinstein
6e9097e63e Merge pull request #16422 from theanalyst/rgw-lc-log-fix
rgw: fix asctime when logging in rgw_lc

Reviewed-by: Daniel Gryniewicz <dang@fprintf.net>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@linuxbox.com>
2017-07-24 08:29:36 -07:00
Shangzhong Zhu
b339ef2507 ceph-disk: s/ceph_osd_mkfs/command_check_call/
Fixes: http://tracker.ceph.com/issues/20685
Signed-off-by: Zhu Shangzhong <zhu.shangzhong@zte.com.cn>
2017-07-24 23:10:36 +08:00
Zhu Shangzhong
f9e9a5e0b5 Update my organization and mail
Signed-off-by: Zhu Shangzhong <zhu.shangzhong@zte.com.cn>
2017-07-24 23:01:05 +08:00
Jos Collin
dbb48ca486 Merge pull request #16524 from dingdangzhang/master
msg/async: use auto iterator having more simple code and good performance

Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-07-24 14:53:13 +00:00
Sage Weil
a9506504a4 mon/OSDMonitor: ensure UP is not set for newly-created OSDs
Due to http://tracker.ceph.com/issues/20751 it is possible for the UP
state bit to be set for OSDs without EXISTS.  Make sure it is cleared as
needed when the OSD id is reused.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-24 10:08:56 -04:00
Kefu Chai
5ca6d726f7 Merge pull request #16481 from nikitych/bug20706
ceph-disk: Fix for missing 'not' in *_is_diskdevice checks

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-24 22:03:10 +08:00
Kefu Chai
7a497c372b Merge pull request #16247 from shangzhong/wip-20556
ceph-disk: change the lockbox partition number to 5

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-24 22:02:48 +08:00
Sage Weil
29549e6834 Merge pull request #13723 from ovh/bp-forced-recovery
osd/PG: make prioritized recovery possible

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-07-24 09:01:03 -05:00
Sage Weil
5a422d7c9b Merge pull request #16504 from Yan-waller/wip-walle-0721osdclients
osd: fix OpRequest and tracked op dump information

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-24 08:59:37 -05:00
Sage Weil
c8e16de497 Merge pull request #16512 from liupan1111/wip-fix-latency
common: the latency dumped by "ceph osd perf" is not real

Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-24 08:59:01 -05:00
Sage Weil
f219d49ad4 Merge pull request #16518 from liewegas/wip-20751
mon/OSDMonitor: remove zeroed new_state updates

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-24 08:57:39 -05:00
John Spray
5026fffbfa Merge pull request #16365 from jcsp/wip-osd-marked-me-down
osd: rephrase "wrongly marked me down" clog message

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2017-07-24 14:55:41 +01:00
John Spray
343e1a4281 qa: update whitelist for "wrongly marked me down"
Signed-off-by: John Spray <john.spray@redhat.com>
2017-07-24 14:54:46 +01:00
John Spray
a83774013c osd: rephrase "wrongly marked me down" clog message
Rephrase as "Monitor daemon marked osd.<id> down, but it is
still running", which is more descriptive.  Demote the
epoch information to DEBUG level.

Signed-off-by: John Spray <john.spray@redhat.com>
2017-07-24 14:54:46 +01:00
Sage Weil
fc8374b472 Merge pull request #16326 from liewegas/wip-weight-set
crush,mon: add weight-set introspection and manipulation commands

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com
2017-07-24 08:27:06 -05:00
dingdangzhang
c5ae6e0559 use auto iterator having more simple code and good performence
Signed-off-by: dingdangzhang <boqian.zy@alibaba-inc.com>
2017-07-24 21:26:58 +08:00
John Spray
28671104a4 common: remove dead default values from legacy opts
These were dead code and could cause confusion.

The actual default values live in options.cc since
it was added.

Signed-off-by: John Spray <john.spray@redhat.com>
2017-07-24 09:04:00 -04:00
John Spray
48aa368db9 common: reinstate freebsd ifdefs in options.cc
The automated conversion missed these.

Signed-off-by: John Spray <john.spray@redhat.com>
2017-07-24 09:04:00 -04:00
John Spray
4d06719f10 common: use code_environment_t for daemon-ness in config
...and reinstate the set_daemon_default versions of config options
in place of the special casing in common_init.

Signed-off-by: John Spray <john.spray@redhat.com>
2017-07-24 09:03:59 -04:00
John Spray
89acbd5310 common/options: mark all obvious LEVEL_DEV options
This is everthing matching kill.*at, debug, inject.

Signed-off-by: John Spray <john.spray@redhat.com>
2017-07-24 09:03:59 -04:00
John Spray
69eaa7ff9f common: separate out options by subsystem
This avoids compiler warning about one oversized
literal, allows us to add_service en-masse to
the whole collection, and avoids potential merge
conflicts when config changes in separate subsystems
are made.

Signed-off-by: John Spray <john.spray@redhat.com>
2017-07-24 09:03:59 -04:00
John Spray
34f412573d Merge pull request #16360 from dillaman/wip-rbd-mirror-service-daemon
mgr/dashboard: rbd mirroring status page

Reviewed-by: John Spray <john.spray@redhat.com>
2017-07-24 14:00:51 +01:00
John Spray
478ba0568e Merge pull request #16529 from Liuchang0812/wip-20750
mgr/status: row has incorrect number of values

Reviewed-by: John Spray <john.spray@redhat.com>
2017-07-24 12:40:52 +01:00
Kefu Chai
fa36dc3e55 Merge pull request #16503 from renhwztetecs/renhw-wip-mon-rebuild-doc
doc/mon: fix ceph-authtool command in rebuild mon's sample

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-24 19:39:44 +08:00
chenhg
5dd3dff0f6 OSDMonitor: check mon_max_pool_pg_num when set pool pg_num
Check the mon_max_pool_pg_num when creating pools, but did not

check in the the modification. So we can create a pool and then

modify pg_num exceeds the mon_max_pool_pg_num limit.

By following these steps can verify this problem

step 1: set  mon_max_pool_pg_num = 65536

step 2: ceph osd pool create testpool 65536 65536

step 3: ceph osd pool set testpool pg_num 65537

Signed-off-by: chenhg <c744402859@gmail.com>
2017-07-24 18:36:30 +08:00
Kefu Chai
8cf3b6b92f Merge pull request #16523 from tchaikov/wip-ceph-disk-asok-dir
tests: add setup/teardown for asok dir

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
2017-07-24 18:31:37 +08:00
Kefu Chai
e7e58277a6 doc/rados/operations/add-or-rm-osds: fix dead hyper link
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-07-24 18:16:25 +08:00
Kefu Chai
780c9acd43 doc: document "ceph osd set-require-min-compat-client"
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-07-24 18:16:25 +08:00
liuchang0812
c7a88e42d1 mgr/status: row has incorrect number of values
Fixes: http://tracker.ceph.com/issues/20750

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
2017-07-24 17:34:45 +08:00
Xie Xingguo
42d14a62c8 Merge pull request #16507 from scienceluo/patch-1
Update .organizationmap

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-24 17:28:24 +08:00
huanwen ren
f4dd2801ca doc/mon: fix ceph-authtool create keyring
if use "ceph-authtool keyring -n mon. --cap mon allow 'allow *'"
as err:
[root]# ceph-authtool keyring -n mon. --cap mon allow 'allow *'
ceph-authtool: unexpected 'allow *'

Excessive "allow" is the cause of the error

Signed-off-by huanwen ren <ren.huanwen@zte.com.cn>
2017-07-24 17:00:10 +08:00
Kefu Chai
4a6a3413b2 doc: document "ceph features"
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-07-24 16:54:10 +08:00
Kefu Chai
8c1a2b1d94 vstart.sh: do not try to remove default asok_dir
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-07-24 16:40:10 +08:00