]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agoos/bluestore/BlueStore: remove useless judgement. 16315/head
Jianpeng Ma [Thu, 13 Jul 2017 17:07:48 +0000 (01:07 +0800)]
os/bluestore/BlueStore: remove useless judgement.

In fact logger is never null.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
8 years agoos/bluestore/BlueStore: no need to recalc.
Jianpeng Ma [Thu, 13 Jul 2017 16:33:50 +0000 (00:33 +0800)]
os/bluestore/BlueStore: no need to recalc.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
8 years agoos/bluestore/BlueStore: using buffprt::zero rather than memset.
Jianpeng Ma [Thu, 13 Jul 2017 16:23:06 +0000 (00:23 +0800)]
os/bluestore/BlueStore: using buffprt::zero rather than memset.

Just for the code to look consistent

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
8 years agoos/bluestore/BlueStore: using bufferlist::copy avoid rebuild.
Jianpeng Ma [Wed, 12 Jul 2017 12:08:25 +0000 (20:08 +0800)]
os/bluestore/BlueStore: using bufferlist::copy avoid rebuild.

If using bufferlist::get_contiguous, there is maybe rebuild whic cause
redundat memcopy. And bufferlist::copy can do the same function.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
8 years agoMerge pull request #16224 from liewegas/wip-docs-prune
Alfredo Deza [Tue, 11 Jul 2017 20:44:30 +0000 (16:44 -0400)]
Merge pull request #16224 from liewegas/wip-docs-prune

doc: update intro, quick start docs

Reviewed-by: Alfredo Deza <adeza@redhat.com>
8 years agoMerge pull request #15632 from aclamk/wip-vstart-20235-multiple-radosgw
Casey Bodley [Tue, 11 Jul 2017 19:28:47 +0000 (15:28 -0400)]
Merge pull request #15632 from aclamk/wip-vstart-20235-multiple-radosgw

vstart: allow to start multiple radosgw when RGW=x

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #16265 from dzafman/wip-20470
Sage Weil [Tue, 11 Jul 2017 18:46:33 +0000 (13:46 -0500)]
Merge pull request #16265 from dzafman/wip-20470

test: Fix reg11184 test to remove extraneous pg

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16244 from liewegas/wip-11793
Sage Weil [Tue, 11 Jul 2017 18:01:42 +0000 (13:01 -0500)]
Merge pull request #16244 from liewegas/wip-11793

qa/suites/rados/thrash/workload/*: enable rados.py cache tiering ops

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoqa/suites/: enable rados.py cache tiering ops 16244/head
Sage Weil [Tue, 11 Jul 2017 18:01:15 +0000 (14:01 -0400)]
qa/suites/: enable rados.py cache tiering ops

These weren't being exercised!

See http://tracker.ceph.com/issues/11793

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15836 from xiexingguo/wip-refactor-try-reuse-blob
Sage Weil [Tue, 11 Jul 2017 17:59:42 +0000 (12:59 -0500)]
Merge pull request #15836 from xiexingguo/wip-refactor-try-reuse-blob

os/bluestore: slightly refactor Blob::try_reuse_blob

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16245 from cbodley/wip-global-zlib-compressor
Sage Weil [Tue, 11 Jul 2017 17:59:23 +0000 (12:59 -0500)]
Merge pull request #16245 from cbodley/wip-global-zlib-compressor

compressor/zlib: remove g_ceph_context/g_conf from compressor plugin

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
8 years agoMerge pull request #16091 from runsisi/wip-lock-type
Sage Weil [Tue, 11 Jul 2017 17:58:12 +0000 (12:58 -0500)]
Merge pull request #16091 from runsisi/wip-lock-type

cls_lock: move lock_info_t definition to cls_lock_types.h

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #16158 from majianpeng/bluestore-using-bufferlist-function-do...
Sage Weil [Tue, 11 Jul 2017 17:57:58 +0000 (12:57 -0500)]
Merge pull request #16158 from majianpeng/bluestore-using-bufferlist-function-do-the-same-function

os/bluestore: use bufferlist functions whenever possible

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16227 from tchaikov/wip-kill-clang-analyzer-warnings
Sage Weil [Tue, 11 Jul 2017 17:56:45 +0000 (12:56 -0500)]
Merge pull request #16227 from tchaikov/wip-kill-clang-analyzer-warnings

mgr,os,test: kill clang analyzer warnings

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
8 years agoMerge pull request #16239 from xiexingguo/wip-crush-weight-overflow
Sage Weil [Tue, 11 Jul 2017 17:56:15 +0000 (12:56 -0500)]
Merge pull request #16239 from xiexingguo/wip-crush-weight-overflow

mon: a few more upmap (and other) fixes

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16249 from gregsfortytwo/wip-20562-cluster-stats
Sage Weil [Tue, 11 Jul 2017 17:55:19 +0000 (12:55 -0500)]
Merge pull request #16249 from gregsfortytwo/wip-20562-cluster-stats

mon: maintain the "cluster" PerfCounters when using ceph-mgr

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
8 years agotest: Fix reg11184 test to remove extraneous pg 16265/head
David Zafman [Fri, 7 Jul 2017 20:56:55 +0000 (13:56 -0700)]
test: Fix reg11184 test to remove extraneous pg

Minor cleanups
Remove unused pool to aid future analysis

Signed-off-by: David Zafman <dzafman@redhat.com>
8 years agoFixed too big privileges for client.rgw. 15632/head
Adam Kupczyk [Tue, 11 Jul 2017 17:12:33 +0000 (13:12 -0400)]
Fixed too big privileges for client.rgw.

Signed-off-by: Adam Kupczyk <akucpzyk@redhat.com>
8 years agoMerge pull request #15989 from linuxbox2/wip-nfs-compress
Matt Benjamin [Tue, 11 Jul 2017 13:24:16 +0000 (09:24 -0400)]
Merge pull request #15989 from linuxbox2/wip-nfs-compress

rgw_file: add compression interop to RGW NFS

8 years agorgw_file: add large(ish) write test 15989/head
Matt Benjamin [Tue, 2 May 2017 20:06:47 +0000 (16:06 -0400)]
rgw_file: add large(ish) write test

allows for read-after-write verify

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agorgw_file: compression fix and cleanup from review
Matt Benjamin [Thu, 6 Jul 2017 15:59:05 +0000 (11:59 -0400)]
rgw_file:  compression fix and cleanup from review

A fix and a cleanup from Adam Kupczyk <akupczyk@redhat.com> review.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agorgw_file: enable compression filter (stores)
Matt Benjamin [Thu, 4 May 2017 19:47:39 +0000 (15:47 -0400)]
rgw_file:  enable compression filter (stores)

Previously NFS clients could access compressed data, but the
RGWWriteDataRequest lacked glue to attach an inbound
compression filter.

Fixes: http://tracker.ceph.com/issues/20462
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agoMerge pull request #16241 from liewegas/wip-dashboard-default
John Spray [Tue, 11 Jul 2017 09:13:45 +0000 (10:13 +0100)]
Merge pull request #16241 from liewegas/wip-dashboard-default

doc/mgr/dashboard: update dashboard docs to reflect new defaults

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #16034 from guihecheng/rgw_file-policy-read
Matt Benjamin [Tue, 11 Jul 2017 09:04:33 +0000 (05:04 -0400)]
Merge pull request #16034 from guihecheng/rgw_file-policy-read

rgw: rgw_file skip policy read for virtual components

8 years agovstart: allow to start multiple radosgw on consecutive ports
Adam Kupczyk [Mon, 12 Jun 2017 12:47:49 +0000 (14:47 +0200)]
vstart: allow to start multiple radosgw on consecutive ports

Signed-off-by: Adam Kupczyk <akupczyk@mirantis.com>
8 years agoMerge pull request #16229 from Liuchang0812/wip-misc-cleanup
Sage Weil [Mon, 10 Jul 2017 21:50:40 +0000 (16:50 -0500)]
Merge pull request #16229 from Liuchang0812/wip-misc-cleanup

ceph.in, mgr: misc cleanups

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #16230 from jecluis/wip-20443
Sage Weil [Mon, 10 Jul 2017 21:50:08 +0000 (16:50 -0500)]
Merge pull request #16230 from jecluis/wip-20443

mon/Monitor: recreate mon session if features changed

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16233 from liewegas/wip-osd-create
Sage Weil [Mon, 10 Jul 2017 21:49:32 +0000 (16:49 -0500)]
Merge pull request #16233 from liewegas/wip-osd-create

qa/tasks/ceph.py: no osd id to 'osd create' command

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #16235 from tchaikov/wip-timer
Sage Weil [Mon, 10 Jul 2017 21:49:01 +0000 (16:49 -0500)]
Merge pull request #16235 from tchaikov/wip-timer

os/filestore: do not free event if not added

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #16237 from YankunLi/dev-bluestore0710
Sage Weil [Mon, 10 Jul 2017 21:48:44 +0000 (16:48 -0500)]
Merge pull request #16237 from YankunLi/dev-bluestore0710

os/blueStore: Failure retry for opening file

Reviewed-by: Jos Collin <jcollin@redhat.com>
8 years agomon: maintain the "cluster" PerfCounters when using ceph-mgr instead of PGMonitor 16249/head
Greg Farnum [Mon, 10 Jul 2017 20:13:56 +0000 (13:13 -0700)]
mon: maintain the "cluster" PerfCounters when using ceph-mgr instead of PGMonitor

Fixes: http://tracker.ceph.com/issues/20562
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #16246 from gregsfortytwo/wip-fix-mgr-cephx-link
Sage Weil [Mon, 10 Jul 2017 18:16:48 +0000 (13:16 -0500)]
Merge pull request #16246 from gregsfortytwo/wip-fix-mgr-cephx-link

doc: fix link for ceph-mgr cephx authorization

8 years agomon/OSDMonitor: dedup pg-upmap[-items] 16239/head
xie xingguo [Mon, 10 Jul 2017 10:51:38 +0000 (18:51 +0800)]
mon/OSDMonitor: dedup pg-upmap[-items]

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoosd/OSDMap: fix potential divided-by-zero error
xie xingguo [Mon, 10 Jul 2017 10:38:19 +0000 (18:38 +0800)]
osd/OSDMap: fix potential divided-by-zero error

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agomon/OSDMonitor: allow user to permanently delete pool
xie xingguo [Mon, 10 Jul 2017 07:22:32 +0000 (15:22 +0800)]
mon/OSDMonitor: allow user to permanently delete pool

If mon_fake_pool_delete is enabled, "osd pool delete"
will unable to delete pool permanently, as we ask user
to pass in a "--yes-i-really-really-mean-it-no-faking"
string now.

The old "osd pool delete" command won't allow user to do this.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agomon/OSDMonitor: sanity check osd number before applying pg-temp
xie xingguo [Mon, 10 Jul 2017 03:41:51 +0000 (11:41 +0800)]
mon/OSDMonitor: sanity check osd number before applying pg-temp

In case user did something stupid and causing weird results.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agodoc: fix link for ceph-mgr cephx authorization 16246/head
Greg Farnum [Mon, 10 Jul 2017 17:56:53 +0000 (10:56 -0700)]
doc: fix link for ceph-mgr cephx authorization

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agozlib: remove g_ceph_context/g_conf from compressor plugin 16245/head
Casey Bodley [Mon, 10 Jul 2017 17:20:08 +0000 (13:20 -0400)]
zlib: remove g_ceph_context/g_conf from compressor plugin

Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #16177 from Synesis-LLC/fix_rgw_crash_ec_data_pool
Yehuda Sadeh [Mon, 10 Jul 2017 16:53:18 +0000 (09:53 -0700)]
Merge pull request #16177 from Synesis-LLC/fix_rgw_crash_ec_data_pool

rgw: fix not initialized vars which cause rgw crash with ec data pool

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoMerge pull request #15467 from joke-lee/fix-aws-v2-signature-X-Amz-Date-priority
Yuri Weinstein [Mon, 10 Jul 2017 16:39:37 +0000 (09:39 -0700)]
Merge pull request #15467 from joke-lee/fix-aws-v2-signature-X-Amz-Date-priority

rgw:fix s3 aws v2 signature priority between header['X-Amz-Date'] and header['Date']

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #16033 from zhaochao/rgw-add-a-new-errcode-for-non-existed-user
Yuri Weinstein [Mon, 10 Jul 2017 16:34:44 +0000 (09:34 -0700)]
Merge pull request #16033 from zhaochao/rgw-add-a-new-errcode-for-non-existed-user

rgw: add a new error code for non-existed user.

Reviewed-by: Jos Collin <jcollin@redhat.com>
8 years agoMerge pull request #16185 from smithfarm/wip-lease-stack-spawn
Yuri Weinstein [Mon, 10 Jul 2017 16:31:08 +0000 (09:31 -0700)]
Merge pull request #16185 from smithfarm/wip-lease-stack-spawn

rgw: lease_stack: use reset method instead of assignment

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #16204 from jimifm/wip-rgw_frontend
Yuri Weinstein [Mon, 10 Jul 2017 16:30:33 +0000 (09:30 -0700)]
Merge pull request #16204 from jimifm/wip-rgw_frontend

rgw/rgw_frontend.h: Return negative value for empty uid in RGWLoadGenFrontend::init()

Reviewed-by: Jos Collin <jcollin@redhat.com>
8 years agoMerge pull request #16016 from liewegas/wip-osd-df
Sage Weil [Mon, 10 Jul 2017 15:39:43 +0000 (10:39 -0500)]
Merge pull request #16016 from liewegas/wip-osd-df

mon: include device class in tree view; hide shadow hierarchy

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoqa/tasks/ceph.py: no osd id to 'osd create' command 16233/head
Sage Weil [Sun, 9 Jul 2017 19:03:21 +0000 (15:03 -0400)]
qa/tasks/ceph.py: no osd id to 'osd create' command

This isn't recognized by hammer, and we don't need it for jewel.

Fixes: http://tracker.ceph.com/issues/20548
Signed-off-by: Sage Weil <sage@redhat.com>
8 years agodoc/start/quick-ceph-deploy: fix typos etc 16224/head
Sage Weil [Mon, 10 Jul 2017 14:04:24 +0000 (10:04 -0400)]
doc/start/quick-ceph-deploy: fix typos etc

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15858 from liewegas/wip-mgr-servicemap
John Spray [Mon, 10 Jul 2017 14:03:07 +0000 (15:03 +0100)]
Merge pull request #15858 from liewegas/wip-mgr-servicemap

mgr,librados: service map

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agodoc/start/intro: add parens to cephfs section
Sage Weil [Mon, 10 Jul 2017 13:57:42 +0000 (09:57 -0400)]
doc/start/intro: add parens to cephfs section

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agodoc/mgr/dashboard: update dashboard docs to reflect new defaults 16241/head
Sage Weil [Mon, 10 Jul 2017 13:48:50 +0000 (09:48 -0400)]
doc/mgr/dashboard: update dashboard docs to reflect new defaults

Also add not about load balancer.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agodoc/start/quick-deph-deploy: update quick deploy instructions
Sage Weil [Fri, 7 Jul 2017 21:23:24 +0000 (17:23 -0400)]
doc/start/quick-deph-deploy: update quick deploy instructions

- include mgr
- simplify
- remove references to old stuff as new

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agodoc/start/quick-ceph-deploy: drop redundant warning
Sage Weil [Fri, 7 Jul 2017 20:34:43 +0000 (16:34 -0400)]
doc/start/quick-ceph-deploy: drop redundant warning

This is part of preflight.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agodoc/start: simplify quick start install process
Sage Weil [Fri, 7 Jul 2017 20:31:52 +0000 (16:31 -0400)]
doc/start: simplify quick start install process

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agodoc/start: rename Installation (quick) -> Installation (ceph-deploy)
Sage Weil [Fri, 7 Jul 2017 20:26:34 +0000 (16:26 -0400)]
doc/start: rename Installation (quick) -> Installation (ceph-deploy)

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agodoc/start/os-recommendations: updates
Sage Weil [Fri, 7 Jul 2017 19:46:08 +0000 (15:46 -0400)]
doc/start/os-recommendations: updates

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agodoc/start/intro: updates
Sage Weil [Fri, 7 Jul 2017 19:41:43 +0000 (15:41 -0400)]
doc/start/intro: updates

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agotest/mon/osd-crush-tree.rng: fix expected xml schema for osd tree 16016/head
Sage Weil [Mon, 10 Jul 2017 13:31:54 +0000 (09:31 -0400)]
test/mon/osd-crush-tree.rng: fix expected xml schema for osd tree

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agotest/cli/osdmaptool/tree.t: fix
Sage Weil [Mon, 10 Jul 2017 13:25:09 +0000 (09:25 -0400)]
test/cli/osdmaptool/tree.t: fix

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16049 from fullerdj/wip-djf-key-timeout
Alfredo Deza [Mon, 10 Jul 2017 11:52:24 +0000 (07:52 -0400)]
Merge pull request #16049 from fullerdj/wip-djf-key-timeout

ceph-create-keys: add an argument to override default 10-minute timeout

Reviewed-by: Alfredo Deza <adeza@redhat.com>
8 years agoMerge pull request #16236 from shashalu/clean-up-RGWRemoteDataLog-unused-function
Jos Collin [Mon, 10 Jul 2017 11:23:24 +0000 (11:23 +0000)]
Merge pull request #16236 from shashalu/clean-up-RGWRemoteDataLog-unused-function

rgw: drop unused function RGWRemoteDataLog::get_shard_info()

Reviewed-by: Jos Collin <jcollin@redhat.com>
8 years agoBlueStore:Failure retry for opening file 16237/head
YankunLi [Mon, 10 Jul 2017 08:39:58 +0000 (16:39 +0800)]
BlueStore:Failure retry for opening file

Failure retry to open file

Signed-off-by: Yankun Li <lioveni99@gmail.com>
8 years agorgw:multisite: clean up RGWRemoteDataLog unused function 16236/head
lu.shasha [Mon, 10 Jul 2017 08:14:55 +0000 (16:14 +0800)]
rgw:multisite: clean up RGWRemoteDataLog unused function

'RGWRemoteDataLog::get_shard_info' function not used, drop it

Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>
8 years agoos/filestore: do not free event not added 16235/head
Kefu Chai [Mon, 10 Jul 2017 07:31:43 +0000 (15:31 +0800)]
os/filestore: do not free event not added

if an event fails to be added, it's freed by the callee. so we should
not try to free it again. that address could be re-used by the
allocator, to we might be freeing an irrelevent event.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agocommon/Timer: return false if event not added
Kefu Chai [Mon, 10 Jul 2017 07:31:16 +0000 (15:31 +0800)]
common/Timer: return false if event not added

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agomon/OSDMonitor: guard "osd crush rule create-replicated"
xie xingguo [Mon, 10 Jul 2017 03:25:53 +0000 (11:25 +0800)]
mon/OSDMonitor: guard "osd crush rule create-replicated"

require Luminous before using the crush device classes.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoosd/OSDMap: apply both pg_upmap and pg_upmap_items
xie xingguo [Mon, 10 Jul 2017 03:06:41 +0000 (11:06 +0800)]
osd/OSDMap: apply both pg_upmap and pg_upmap_items

This allows a more flexible upmap policy by combinating
both pg_upmap and pg_upmap_items.

For example:
./bin/ceph osd pg-upmap 1.0 1 2 3
set 1.0 pg_upmap mapping to [1,2,3]

./bin/ceph osd pg-upmap-items 1.0 1 5
set 1.0 pg_upmap_items mapping to [1->5]

 ./bin/ceph pg ls-by-pool cephfs_data_a
PG_STAT OBJECTS MISSING_ON_PRIMARY DEGRADED MISPLACED UNFOUND BYTES LOG DISK_LOG STATE        STATE_STAMP                VERSION REPORTED UP      UP_PRIMARY ACTING  ACTING_PRIMARY
1.0           0                  0        0         0       0     0   0        0 active+clean 2017-07-10 11:04:53.955681     0'0    22:13 [5,2,3]          5 [5,2,3]              5

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agomon/OSDMonitor: improve "osd upmap" error message
xie xingguo [Sat, 8 Jul 2017 08:07:45 +0000 (16:07 +0800)]
mon/OSDMonitor: improve "osd upmap" error message

by adding a explicit guide.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agocrush: fix potential weight overflow
xie xingguo [Sat, 8 Jul 2017 03:47:42 +0000 (11:47 +0800)]
crush: fix potential weight overflow

E.g.:
./bin/ceph osd crush reweight osd.0 32768

ID WEIGHT      TYPE NAME                                            UP/DOWN REWEIGHT PRIMARY-AFFINITY
-4 32770.00000 root default~hdd
-3           -     host gitbuilder-ceph-rpm-centos7-amd64-basic~hdd
 0           -         osd.0                                             up  1.00000          1.00000
 1     1.00000         osd.1                                             up  1.00000          1.00000
 2     1.00000         osd.2                                             up  1.00000          1.00000
-1 32770.00000 root default
-2           -     host gitbuilder-ceph-rpm-centos7-amd64-basic
 0           -         osd.0                                             up  1.00000          1.00000
 1     1.00000         osd.1                                             up  1.00000          1.00000
 2     1.00000         osd.2                                             up  1.00000          1.00000

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #16160 from xiexingguo/wip-misc2
Sage Weil [Mon, 10 Jul 2017 01:23:13 +0000 (20:23 -0500)]
Merge pull request #16160 from xiexingguo/wip-misc2

mon, osd: misc fixes and cleanups

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #16220 from dzafman/wip-20544
Sage Weil [Mon, 10 Jul 2017 01:22:46 +0000 (20:22 -0500)]
Merge pull request #16220 from dzafman/wip-20544

mon: Fix status output warning for mon_warn_osd_usage_min_max_delta

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16223 from liewegas/wip-dashboard-default
Sage Weil [Mon, 10 Jul 2017 01:20:52 +0000 (20:20 -0500)]
Merge pull request #16223 from liewegas/wip-dashboard-default

pybind/mgr/dashboard: bind to :: by default

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agorgw: register as a service 15858/head
Yehuda Sadeh [Fri, 30 Jun 2017 16:04:05 +0000 (12:04 -0400)]
rgw: register as a service

support dynamic reload, and also add frontend info

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agomon: make service summary string customizable; simple default
Sage Weil [Tue, 27 Jun 2017 13:32:44 +0000 (09:32 -0400)]
mon: make service summary string customizable; simple default

Eventually the mgr can populate this field with something tailored to the
service.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomgr: set hostname propery on ServiceMap services
John Spray [Mon, 26 Jun 2017 23:42:34 +0000 (19:42 -0400)]
mgr: set hostname propery on ServiceMap services

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agolibrados: include common daemon metadata in service_daemon_register
John Spray [Mon, 26 Jun 2017 23:10:24 +0000 (19:10 -0400)]
librados: include common daemon metadata in service_daemon_register

Aside from being generally useful, this uniformity enables ceph-mgr
to have some common information about all the hosts
it knows about; otherwise we would sometimes learn
about a host without e.g. knowing about the cpu/ram/kernel.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agomgr: expose daemon status to modules
Sage Weil [Mon, 26 Jun 2017 19:55:19 +0000 (15:55 -0400)]
mgr: expose daemon status to modules

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomgr/PyModules: expose service_map to modules
Sage Weil [Mon, 26 Jun 2017 19:54:59 +0000 (15:54 -0400)]
mgr/PyModules: expose service_map to modules

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agolibrados: allow service registrations
Sage Weil [Mon, 26 Jun 2017 17:22:57 +0000 (13:22 -0400)]
librados: allow service registrations

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomgr: remove useless headers in MgrStandby.h 16229/head
liuchang0812 [Sat, 8 Jul 2017 14:53:07 +0000 (22:53 +0800)]
mgr: remove useless headers in MgrStandby.h

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
8 years agotool/ceph: print timeout tips iff verbose
liuchang0812 [Sat, 8 Jul 2017 04:50:38 +0000 (12:50 +0800)]
tool/ceph: print timeout tips iff verbose

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
8 years agomon/Monitor: recreate mon session if features changed 16230/head
Joao Eduardo Luis [Sun, 9 Jul 2017 10:28:34 +0000 (11:28 +0100)]
mon/Monitor: recreate mon session if features changed

Fixes: http://tracker.ceph.com/issues/20433
Signed-off-by: Joao Eduardo Luis <joao@suse.de>
8 years agoMerge pull request #16079 from smithfarm/wip-doc-make-check 15972/head
Nathan Cutler [Sun, 9 Jul 2017 11:14:42 +0000 (13:14 +0200)]
Merge pull request #16079 from smithfarm/wip-doc-make-check

doc: dev: add notes on PR make check validation test

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agomon/Monitor: list sessions via admin socket
Joao Eduardo Luis [Sun, 9 Jul 2017 10:27:35 +0000 (11:27 +0100)]
mon/Monitor: list sessions via admin socket

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
8 years agomon/Paxos: fix annoying formatting spacing
Joao Eduardo Luis [Sun, 9 Jul 2017 10:25:40 +0000 (11:25 +0100)]
mon/Paxos: fix annoying formatting spacing

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
8 years agomon/Session: fix some annoying spacing
Joao Eduardo Luis [Sun, 9 Jul 2017 10:25:12 +0000 (11:25 +0100)]
mon/Session: fix some annoying spacing

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
8 years agomon: shorten 'PRIMARY-AFFINITY' -> 'PRI-AFF' column header
Sage Weil [Thu, 29 Jun 2017 16:48:53 +0000 (12:48 -0400)]
mon: shorten 'PRIMARY-AFFINITY' -> 'PRI-AFF' column header

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon: include device class in 'osd tree' output
Sage Weil [Thu, 29 Jun 2017 14:01:45 +0000 (10:01 -0400)]
mon: include device class in 'osd tree' output

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon: include class in 'osd df [tree]' output
Sage Weil [Thu, 29 Jun 2017 13:53:51 +0000 (09:53 -0400)]
mon: include class in 'osd df [tree]' output

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocrush: hide device class shadow roots from tree dumper
Sage Weil [Thu, 29 Jun 2017 13:45:13 +0000 (09:45 -0400)]
crush: hide device class shadow roots from tree dumper

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16027 from liewegas/wip-crush-rule-class
Sage Weil [Sun, 9 Jul 2017 02:34:13 +0000 (21:34 -0500)]
Merge pull request #16027 from liewegas/wip-crush-rule-class

mon,crush: create crush rules using device classes for replicated and ec pools via cli

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #16228 from smithfarm/wip-rados-upgrade-2
Sage Weil [Sun, 9 Jul 2017 02:32:36 +0000 (21:32 -0500)]
Merge pull request #16228 from smithfarm/wip-rados-upgrade-2

tests: fix rados/upgrade/jewel-x-singleton and make workunit task handle repo URLs not ending in ".git"

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agomgr: implement 'service dump' and 'service status'
Sage Weil [Mon, 26 Jun 2017 17:22:30 +0000 (13:22 -0400)]
mgr: implement 'service dump' and 'service status'

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomgr: allow/track service registrations
Sage Weil [Mon, 26 Jun 2017 17:22:17 +0000 (13:22 -0400)]
mgr: allow/track service registrations

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon: include services in 'ceph -s'
Sage Weil [Mon, 26 Jun 2017 17:21:35 +0000 (13:21 -0400)]
mon: include services in 'ceph -s'

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon: persist ServiceMap
Sage Weil [Mon, 26 Jun 2017 17:20:58 +0000 (13:20 -0400)]
mon: persist ServiceMap

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomgr: add ServiceMap
Sage Weil [Mon, 26 Jun 2017 17:19:56 +0000 (13:19 -0400)]
mgr: add ServiceMap

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agovstart.sh: give rgw daemons letter names
Sage Weil [Mon, 26 Jun 2017 17:19:07 +0000 (13:19 -0400)]
vstart.sh: give rgw daemons letter names

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomgr: index daemon state by string service type
Sage Weil [Thu, 22 Jun 2017 18:19:17 +0000 (14:19 -0400)]
mgr: index daemon state by string service type

If we use a string we can allow for other service names like
'rgw' and 'rbd-mirror' and 'iscsigw' and so on.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15973 from majianpeng/bluefs-async-compact-log
Sage Weil [Sun, 9 Jul 2017 02:29:59 +0000 (21:29 -0500)]
Merge pull request #15973 from majianpeng/bluefs-async-compact-log

os/bluestore/BlueFS: clear current log entrys before dump all fnode,

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16214 from liupan1111/wip-fix-mutex
Jos Collin [Sun, 9 Jul 2017 01:02:04 +0000 (01:02 +0000)]
Merge pull request #16214 from liupan1111/wip-fix-mutex

common/Mutex.cc: fixed the error in comment

Reviewed-by: Jos Collin <jcollin@redhat.com>
8 years agoqa: workunit: handle repo ending in "/ceph-ci" 16228/head
Nathan Cutler [Sat, 8 Jul 2017 08:48:49 +0000 (10:48 +0200)]
qa: workunit: handle repo ending in "/ceph-ci"

If the repo ends in "/ceph-ci" it's the same as if it ended in "/ceph-ci.git"

Before this change, the following command was broken if the workunit specified,
e.g., "branch: jewel":

teuthology-suite --ceph-repo https://github.com/ceph/ceph --ceph master
--suite-repo https://github.com/ceph/ceph-ci --suite-branch wip-foo . . .

Fixes: http://tracker.ceph.com/issues/20554
Signed-off-by: Nathan Cutler <ncutler@suse.com>