Commit Graph

76008 Commits

Author SHA1 Message Date
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
63d20e4714 doc/release-notes: escape "_" of unintended links
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-07-24 18:23:51 +08:00
Kefu Chai
c3607562be tools: ceph-release-notes: escape _ for unintended links
foobar_ is taken as a hyper link by RST. so escape the underscores.
this change can avoid the warnings like:

ceph/doc/release-notes.rst:4593: ERROR: Unknown target name: "rgwgetusage".

where the source code looks like:
```
 rgw: need to 'open_object_section' before dump stats in 'RGWGetUsage_…(`issue#17499 <http://tracker.ceph.com/issues/17499>`_, `pr#11325 <http://github.com/ceph/ceph/pull/11325>\
`_, weiqiaomiao)
```
and apparently, "RGWGetUsage_" is not a hyper link here.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-07-24 18:18:24 +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
Kefu Chai
b0bd816dd1 tests: add setup/teardown for asok dir
ceph-disk.sh has its own setup/teardown, so update them also. so asok
files will have their parent directory when being created.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-07-24 16:39:17 +08:00
Orit Wasserman
7536d2ecae Merge pull request #16502 from weiqiaomiao/wip_weiqm_unlock_bucket
rgw: should unlock when reshard_log->update() reture non-zero in RGWB…
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2017-07-24 11:25:21 +03:00
weiqiaomiao
86c8b720a1 rgw: Drop Unused function in rgw_usage.cc
fix compile warnning in any PR (Ex: https://jenkins.ceph.com/job/ceph-pull-requests/29193/console):
/home/jenkins-build/build/workspace/ceph-pull-requests/src/rgw/rgw_usage.cc:33:13: warning: ‘void dump_usage_bucket_info(ceph::Formatter*, std::__cxx11::string&, cls_user_bucket_entry&)’ defined but not used [-Wunused-function]
 static void dump_usage_bucket_info(Formatter *formatter, string& name, cls_user_bucket_entry& entry)

Signed-off-by: Wei Qiaomiao <wei.qiaomiao@zte.com.cn>
2017-07-24 12:32:00 +08:00
weiqiaomiao
ff5bd5bd52 rgw: should unlock when reshard_log->update() reture non-zero in RGWBucketReshard::execute()
Signed-off-by: Wei Qiaomiao <wei.qiaomiao@zte.com.cn>
2017-07-24 12:30:01 +08:00
Sage Weil
23b6df4ef0 osd/OSDMap: fix Incremental::dump
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-23 22:03:49 -04:00
Sage Weil
a1611c89df mon/OSDMonitor: remove zeroed new_state updates
These are interpreted as CEPH_OSD_UP in apply_incremental for legacy
reasons--we don't want them!

Fixes: http://tracker.ceph.com/issues/20751
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-23 22:03:47 -04:00
Pan Liu
67991e1f6f common: the latency dumped by "ceph osd perf" is not real
Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
2017-07-23 15:55:47 +08:00
Josh Durgin
3f591d4f43 osd: PrimaryLogPG, PGBackend: complete callback even if interval changes
This avoids leaking the callback passed to remove_missing_object().
Use EAGAIN to signal that the work was not completed, so we don't have
to take the pg lock and check if the interval changed again in
PGBackend.

Fixes: http://tracker.ceph.com/issues/20747
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2017-07-23 02:27:53 -04:00
Sage Weil
27c1d62ae9 Merge pull request #16508 from liewegas/wip-mgr-lock-cycle
mgr: fix lock cycle
2017-07-22 21:14:36 -05:00
Sage Weil
ecd1193ab9 qa/suites/rados/basic/tasks/rgw_snaps: wait for pools to be be created
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-22 18:54:46 -04:00
Sage Weil
9b4002b6b8 qa/suites/rados/basic/tasks/rgw_snaps: fix pool list
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-22 18:54:45 -04:00