]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agomsg/async/rdma: register buffer as continuous 15967/head
Adir Lev [Mon, 5 Jun 2017 12:19:55 +0000 (12:19 +0000)]
msg/async/rdma: register buffer as continuous

Change-Id: I1a715de28ace3ff8ae077ca783ad5060e7966d54
Signed-off-by: Adir Lev <adirl@mellanox.com>
8 years agoMerge pull request #15907 from tchaikov/wip-with-zfs
Kefu Chai [Wed, 28 Jun 2017 02:04:50 +0000 (10:04 +0800)]
Merge pull request #15907 from tchaikov/wip-with-zfs

cmake: fix the build with -DWITH_ZFS=ON

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #15908 from Adirl/twice
Haomai Wang [Wed, 28 Jun 2017 01:55:39 +0000 (09:55 +0800)]
Merge pull request #15908 from Adirl/twice

msg/async/rdma: use lists properly

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #15521 from dillaman/wip-rbd-dashboard
John Spray [Tue, 27 Jun 2017 21:59:32 +0000 (17:59 -0400)]
Merge pull request #15521 from dillaman/wip-rbd-dashboard

pybind/mgr/dashboard: initial block integration

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #15853 from liewegas/wip-simpler-ceph
Sage Weil [Tue, 27 Jun 2017 19:13:53 +0000 (14:13 -0500)]
Merge pull request #15853 from liewegas/wip-simpler-ceph

qa/tasks/ceph: simplify ceph deployment slightly

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoqa/tasks/ceph: explicitly add osds to crush map for upgrades 15853/head
Sage Weil [Tue, 27 Jun 2017 16:52:35 +0000 (12:52 -0400)]
qa/tasks/ceph: explicitly add osds to crush map for upgrades

Before kraken, ceph-osd didn't add itself to crush... ceph-osd-prestart.sh
did it.  And ceph.py doesn't use that.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15955 from liewegas/wip-20431
Sage Weil [Tue, 27 Jun 2017 16:36:38 +0000 (11:36 -0500)]
Merge pull request #15955 from liewegas/wip-20431

qa/tasks/dump_stuck: fix for active+clean+remapped

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoqa/tasks/dump_stuck: fix for active+clean+remapped 15955/head
Sage Weil [Tue, 27 Jun 2017 16:01:07 +0000 (12:01 -0400)]
qa/tasks/dump_stuck: fix for active+clean+remapped

In d24a8886658c2d8882275d69c6409717a62701be we made remapped a clean
state but didn't fix this test.

Fixes: http://tracker.ceph.com/issues/20431
Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocmake: compile libzfs backend conditionally 15907/head
Kefu Chai [Mon, 26 Jun 2017 03:58:28 +0000 (11:58 +0800)]
cmake: compile libzfs backend conditionally

* do not REQUIRE libzfs if it is enabled, this follows the way how we
  handle `WITH_XFS` option.
* also refactor the cmake script related to libxfs backend support a
  little bit.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15874 from elliswuuuuuuuu/remove_unuse_config
Sage Weil [Tue, 27 Jun 2017 15:22:42 +0000 (10:22 -0500)]
Merge pull request #15874 from elliswuuuuuuuu/remove_unuse_config

common/config_opt: remove unused config

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15864 from joscollin/wip-CID1412839-uninitialized-pointer-field
Sage Weil [Tue, 27 Jun 2017 15:22:26 +0000 (10:22 -0500)]
Merge pull request #15864 from joscollin/wip-CID1412839-uninitialized-pointer-field

common: initialize array in struct BackTrace

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15881 from joscollin/wip-1412776-explicit-null-dereferenced
Sage Weil [Tue, 27 Jun 2017 15:22:03 +0000 (10:22 -0500)]
Merge pull request #15881 from joscollin/wip-1412776-explicit-null-dereferenced

common: Passing null pointer option_name to operator << in md_config_t::parse_option()

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15896 from Yan-waller/wip-waller-mgrcleanup0624
Sage Weil [Tue, 27 Jun 2017 15:21:46 +0000 (10:21 -0500)]
Merge pull request #15896 from Yan-waller/wip-waller-mgrcleanup0624

mgr: drop repeated log info. and unnecessary write permission

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15910 from wido/cest-api-fork
Sage Weil [Tue, 27 Jun 2017 15:21:15 +0000 (10:21 -0500)]
Merge pull request #15910 from wido/cest-api-fork

ceph-rest-api: Various REST API fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15915 from liupan1111/wip-add-perfs
Sage Weil [Tue, 27 Jun 2017 15:19:59 +0000 (10:19 -0500)]
Merge pull request #15915 from liupan1111/wip-add-perfs

src/OSD: add more useful perf counters for performance tuning.

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15917 from xiexingguo/wip-upmap-fixes
Sage Weil [Tue, 27 Jun 2017 15:19:41 +0000 (10:19 -0500)]
Merge pull request #15917 from xiexingguo/wip-upmap-fixes

mon/OSDMonitor: a couple of upmap and other fixes

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15935 from zphj1987/master
Sage Weil [Tue, 27 Jun 2017 15:19:22 +0000 (10:19 -0500)]
Merge pull request #15935 from zphj1987/master

ceph-conf: fix typo in usage: 'mon add' should be 'mon addr'

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15885 from liewegas/wip-radosbench-timeout
Yuri Weinstein [Tue, 27 Jun 2017 15:03:12 +0000 (08:03 -0700)]
Merge pull request #15885 from liewegas/wip-radosbench-timeout

qa/tasks/radosbench: increase timeout

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
8 years agoMerge pull request #15882 from rzarzynski/wip-20372
Yuri Weinstein [Tue, 27 Jun 2017 15:01:02 +0000 (08:01 -0700)]
Merge pull request #15882 from rzarzynski/wip-20372

rgw: fixes for AWSBrowserUploadAbstractor auth

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #15931 from cbodley/wip-rgw-slo-compression
Yuri Weinstein [Tue, 27 Jun 2017 15:00:12 +0000 (08:00 -0700)]
Merge pull request #15931 from cbodley/wip-rgw-slo-compression

rgw: use uncompressed size for range_to_ofs() in slo/dlo

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoMerge pull request #15928 from liewegas/wip-rgw-warning
Casey Bodley [Tue, 27 Jun 2017 14:30:02 +0000 (10:30 -0400)]
Merge pull request #15928 from liewegas/wip-rgw-warning

rgw/rgw_op: fix whitespace and indentation warning

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #15920 from wido/docs-mgr-dashboard
Sage Weil [Tue, 27 Jun 2017 14:04:34 +0000 (09:04 -0500)]
Merge pull request #15920 from wido/docs-mgr-dashboard

docs: mgr dashboard

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: John Spray <jspray@redhat.com>
8 years agomsg/async/rdma: avoid adding worker twice to pending_workers 15908/head
Adir Lev [Sun, 28 May 2017 13:11:54 +0000 (13:11 +0000)]
msg/async/rdma: avoid adding worker twice to pending_workers

Change-Id: I4dda9040a055bdb8787ffd23a6928925d0a69d83
Signed-off-by: Adir Lev <adirl@mellanox.com>
8 years agomsg/async/rdma: avoid adding csi twice to pending_list
Adir lev [Sun, 28 May 2017 10:56:29 +0000 (13:56 +0300)]
msg/async/rdma: avoid adding csi twice to pending_list

Change-Id: Id76ffbfebc54c2da339e0e7f063c5420042fbe7c
Signed-off-by: Adir lev <adirl@mellanox.com>
8 years agodoc: Mgr Dashboard docs update 15920/head
Wido den Hollander [Mon, 26 Jun 2017 12:49:28 +0000 (14:49 +0200)]
doc: Mgr Dashboard docs update

More instructions on how to deploy the dashboard using ceph-mgr

Signed-off-by: Wido den Hollander <wido@42on.com>
8 years agoMerge pull request #15919 from dillaman/wip-test-cls-rbd
Mykola Golub [Tue, 27 Jun 2017 10:04:26 +0000 (13:04 +0300)]
Merge pull request #15919 from dillaman/wip-test-cls-rbd

test: fix compile warning in ceph_test_cls_rbd

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #15934 from myoungwon/omw-mailmap
Abhishek L [Tue, 27 Jun 2017 05:45:36 +0000 (07:45 +0200)]
Merge pull request #15934 from myoungwon/omw-mailmap

mailmap: add Myoungwon Oh's mailmap and affiliation

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
8 years agoMerge pull request #15914 from wjwithagen/remotes/origin/wip-wjw-freebsd-osd-scrub...
Kefu Chai [Tue, 27 Jun 2017 04:03:06 +0000 (12:03 +0800)]
Merge pull request #15914 from wjwithagen/remotes/origin/wip-wjw-freebsd-osd-scrub-repair-3

test/osd/osd-scrub-repair.sh: Fix diff options on FreeBSD

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15856 from cbodley/wip-rgw-vstart-s3tests
Sage Weil [Tue, 27 Jun 2017 03:47:58 +0000 (22:47 -0500)]
Merge pull request #15856 from cbodley/wip-rgw-vstart-s3tests

vstart: remove rgw_enable_static_website

8 years agoMerge pull request #15863 from gmayyyha/paxosservice-use-func
Sage Weil [Tue, 27 Jun 2017 03:47:20 +0000 (22:47 -0500)]
Merge pull request #15863 from gmayyyha/paxosservice-use-func

mon/PaxosService: use __func__ instead of hard code function name

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15759 from ovh/bp-optimized-bs-key-escape
Sage Weil [Tue, 27 Jun 2017 02:25:43 +0000 (21:25 -0500)]
Merge pull request #15759 from ovh/bp-optimized-bs-key-escape

os/bluestore: optimized (encode|decode)_escaped

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15765 from jimmyway/wip-ec-plan-cleanup
Sage Weil [Tue, 27 Jun 2017 02:25:26 +0000 (21:25 -0500)]
Merge pull request #15765 from jimmyway/wip-ec-plan-cleanup

osd/ECTransaction: cleanup the redundant check which works in overwrite IO context

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoceph-conf: fix typo in usage: 'mon add' should be 'mon addr' 15935/head
Peng Zhang [Tue, 27 Jun 2017 01:18:56 +0000 (09:18 +0800)]
ceph-conf: fix typo in usage: 'mon add' should be 'mon addr'

src/test/cli/ceph-conf/help.t
src/tools/ceph_conf.cc

fix add to addr

Signed-off-by: Peng Zhang zphj1987@gmail.com
8 years agomailmap: add Myoungwon Oh's mailmap and affiliation 15934/head
myoungwon oh [Tue, 27 Jun 2017 01:08:24 +0000 (10:08 +0900)]
mailmap: add Myoungwon Oh's mailmap and affiliation

Signed-off-by: Myoungwon Oh <omwmw@sk.com>
8 years agorgw: use uncompressed size for range_to_ofs() in slo/dlo 15931/head
Casey Bodley [Mon, 26 Jun 2017 19:52:47 +0000 (15:52 -0400)]
rgw: use uncompressed size for range_to_ofs() in slo/dlo

Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agorgw/rgw_op: fix some more whitespace 15928/head
Sage Weil [Mon, 26 Jun 2017 19:48:16 +0000 (15:48 -0400)]
rgw/rgw_op: fix some more whitespace

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agorgw/rgw_op: fix indentation warning
Sage Weil [Mon, 26 Jun 2017 19:47:38 +0000 (15:47 -0400)]
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>
8 years agoqa/tasks/radosbench: increase timeout 15885/head
Sage Weil [Fri, 23 Jun 2017 15:12:01 +0000 (11:12 -0400)]
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>
8 years agoMerge pull request #14997 from ivancich/wip-bring-in-dmclock-p2
Sage Weil [Mon, 26 Jun 2017 18:40:16 +0000 (13:40 -0500)]
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>
8 years agoMerge pull request #15569 from aclamk/compress_crash_bug_refactor
Casey Bodley [Mon, 26 Jun 2017 18:14:20 +0000 (14:14 -0400)]
Merge pull request #15569 from aclamk/compress_crash_bug_refactor

rgw: Compress crash bug refactor

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #15859 from smithfarm/wip-swift-task-move-master 15909/head
Zack Cerza [Mon, 26 Jun 2017 16:16:42 +0000 (10:16 -0600)]
Merge pull request #15859 from smithfarm/wip-swift-task-move-master

tests: move swift.py task from teuthology to ceph, phase one (master)

8 years agoMerge pull request #15555 from liewegas/wip-19023
Kefu Chai [Mon, 26 Jun 2017 16:08:04 +0000 (00:08 +0800)]
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>
8 years agoMerge pull request #15862 from yuyuyu101/wip-omap-enoent
Kefu Chai [Mon, 26 Jun 2017 15:56:28 +0000 (23:56 +0800)]
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>
8 years agoMerge pull request #15866 from tchaikov/wip-set-secrets
Kefu Chai [Mon, 26 Jun 2017 15:56:02 +0000 (23:56 +0800)]
Merge pull request #15866 from tchaikov/wip-set-secrets

auth/RotatingKeyRing: use std::move() to set secrets

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15905 from tchaikov/wip-kill-clang-warnings
Kefu Chai [Mon, 26 Jun 2017 15:53:21 +0000 (23:53 +0800)]
Merge pull request #15905 from tchaikov/wip-kill-clang-warnings

test, ceph-osdomap-tool: kill clang warnings

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agosrc/OSD: add more useful perf counters for performance tuning. 15915/head
Pan Liu [Mon, 26 Jun 2017 15:43:23 +0000 (23:43 +0800)]
src/OSD: add more useful perf counters for performance tuning.

Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
8 years agoMerge pull request #13753 from theanalyst/wip/f/rgw/tagging
Casey Bodley [Mon, 26 Jun 2017 13:14:05 +0000 (09:14 -0400)]
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>
8 years agoMerge pull request #15889 from joscollin/wip-1412614-uninitialized-scalar-field
Jason Dillaman [Mon, 26 Jun 2017 13:08:08 +0000 (09:08 -0400)]
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>
8 years agotest: fix compile warning in ceph_test_cls_rbd 15919/head
Jason Dillaman [Mon, 26 Jun 2017 12:57:37 +0000 (08:57 -0400)]
test: fix compile warning in ceph_test_cls_rbd

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agomon/OSDMonitor: add use_gmt_hitset to "osd pool get" cmd filter 15917/head
xie xingguo [Sat, 24 Jun 2017 08:12:05 +0000 (16:12 +0800)]
mon/OSDMonitor: add use_gmt_hitset to "osd pool get" cmd filter

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agomon/OSDMonitor: drop debug_fake_ec_pool from "osd pool set" cmd filter
xie xingguo [Sat, 24 Jun 2017 07:52:05 +0000 (15:52 +0800)]
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>
8 years agomon/OSDMonitor: fix wrong sanity check order for allow_ec_overwrites
xie xingguo [Sat, 24 Jun 2017 07:38:49 +0000 (15:38 +0800)]
mon/OSDMonitor: fix wrong sanity check order for allow_ec_overwrites

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agomon/OSDMonitor: make blacklist expire configurable; fix potential races
xie xingguo [Sat, 24 Jun 2017 06:50:57 +0000 (14:50 +0800)]
mon/OSDMonitor: make blacklist expire configurable; fix potential races

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agomon/OSDMonitor: fix wrong comment, wrong indention, wrong output etc.
xie xingguo [Sat, 24 Jun 2017 06:10:42 +0000 (14:10 +0800)]
mon/OSDMonitor: fix wrong comment, wrong indention, wrong output etc.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agomon/OSDMonitor: strict comparison condition
xie xingguo [Sat, 24 Jun 2017 06:05:59 +0000 (14:05 +0800)]
mon/OSDMonitor: strict comparison condition

To match the specifications of straw_calc_version.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoosd/osd_type: map.find() -> map.count() for existense checking
xie xingguo [Sat, 24 Jun 2017 04:13:15 +0000 (12:13 +0800)]
osd/osd_type: map.find() -> map.count() for existense checking

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agomon/OSDMonitor: kill dead code
xie xingguo [Sat, 24 Jun 2017 04:09:17 +0000 (12:09 +0800)]
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>
8 years agomon/OSDMonitor: make pg-up-items result a bit nicer
xie xingguo [Sat, 24 Jun 2017 03:36:15 +0000 (11:36 +0800)]
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>
8 years agomon/OSDMonitor: reject updating upmap if number of osd overflows/underflows
xie xingguo [Sat, 24 Jun 2017 03:31:16 +0000 (11:31 +0800)]
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>
8 years agoosd/OSDMap: make apply_upmap handle multiple pg-upmap-items correctly
xie xingguo [Sat, 24 Jun 2017 01:55:24 +0000 (09:55 +0800)]
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>
8 years agotest/osd/osd-scrub-repair.sh: Fix diff options 15914/head
Willem Jan Withagen [Mon, 26 Jun 2017 11:23:59 +0000 (13:23 +0200)]
test/osd/osd-scrub-repair.sh: Fix diff options

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agorest api: Set application variable when not executed as __main__ 15910/head
Wido den Hollander [Mon, 26 Jun 2017 09:50:50 +0000 (11:50 +0200)]
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>
8 years agorest api: Set default ceph.conf and id options
Wido den Hollander [Mon, 26 Jun 2017 09:50:34 +0000 (11:50 +0200)]
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>
8 years agorest api: Listen on :: (IPv6) instead of 0.0.0.0
Wido den Hollander [Mon, 26 Jun 2017 09:46:58 +0000 (11:46 +0200)]
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>
8 years agocommon: Passing null pointer option_name to operator << in md_config_t::parse_option() 15881/head
Jos Collin [Fri, 23 Jun 2017 13:38:03 +0000 (19:08 +0530)]
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>
8 years agoradosgw: refactor compression code 15569/head
Adam Kupczyk [Wed, 7 Jun 2017 07:59:24 +0000 (09:59 +0200)]
radosgw: refactor compression code

Signed-off-by: Adam Kupczyk <akupczyk@mirantis.com>
8 years agoradosgw, compression: added unit test
Adam Kupczyk [Thu, 1 Jun 2017 12:57:44 +0000 (14:57 +0200)]
radosgw, compression: added unit test

Signed-off-by: Adam Kupczyk <akupczyk@mirantis.com>
8 years agorgw: connection reset/crashed when download large zero object with compression enable
fang.yuxiang [Sat, 27 May 2017 08:21:34 +0000 (16:21 +0800)]
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
8 years agoos/ZFS: make it compilable
Kefu Chai [Mon, 26 Jun 2017 03:59:45 +0000 (11:59 +0800)]
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>
8 years agoMerge pull request #15445 from wjwithagen/wip-wjw-freebsd-osd-scrub-repair-2
Kefu Chai [Mon, 26 Jun 2017 02:14:10 +0000 (10:14 +0800)]
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>
8 years agomgr: drop unnecessary write permission 15896/head
Yan Jun [Sat, 24 Jun 2017 04:49:59 +0000 (12:49 +0800)]
mgr: drop unnecessary write permission

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
8 years agomgr: use readable errno strings
Yan Jun [Sat, 24 Jun 2017 03:37:13 +0000 (11:37 +0800)]
mgr: use readable errno strings

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
8 years agoMerge pull request #15902 from joscollin/wip-1411820-Division-or-modulo-by-zero
Jos Collin [Mon, 26 Jun 2017 01:30:57 +0000 (01:30 +0000)]
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>

8 years agoceph-osdomap-tool: early return and remove never-read store statement 15905/head
Kefu Chai [Sun, 25 Jun 2017 15:00:00 +0000 (23:00 +0800)]
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>
8 years agoMerge pull request #15903 from Adirl/data_path_fixes
Haomai Wang [Sun, 25 Jun 2017 14:52:02 +0000 (22:52 +0800)]
Merge pull request #15903 from Adirl/data_path_fixes

msg/async/rdma: Data path fixes

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agotest/test_async_driver: silence clang static analyzer warning
Kefu Chai [Sun, 25 Jun 2017 14:48:21 +0000 (22:48 +0800)]
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>
8 years agotests: swift.py: tweak imports 15859/head
Nathan Cutler [Sun, 25 Jun 2017 10:42:36 +0000 (12:42 +0200)]
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>
8 years agotest: Division by zero in Legacy::encode_n() 15902/head
Jos Collin [Sat, 24 Jun 2017 15:29:43 +0000 (20:59 +0530)]
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>
8 years agoMerge pull request #15826 from xiexingguo/wip-bluestore-20170622
Sage Weil [Sun, 25 Jun 2017 04:21:50 +0000 (23:21 -0500)]
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>
8 years agoMerge pull request #15865 from tchaikov/wip-mgr-pg-command
Sage Weil [Sun, 25 Jun 2017 04:21:27 +0000 (23:21 -0500)]
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>
8 years agoMerge pull request #15875 from xiexingguo/wip-osdmon-20170623
Sage Weil [Sun, 25 Jun 2017 04:21:02 +0000 (23:21 -0500)]
Merge pull request #15875 from xiexingguo/wip-osdmon-20170623

mon/OSDMonitor: "osd crush class rename" support

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15890 from tchaikov/wip-19741
Sage Weil [Sun, 25 Jun 2017 04:20:38 +0000 (23:20 -0500)]
Merge pull request #15890 from tchaikov/wip-19741

osdc/Objecter: release message if it's not handled

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #15891 from minggr/wip-sdata_op_ordering_lock
Sage Weil [Sun, 25 Jun 2017 04:20:19 +0000 (23:20 -0500)]
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>
8 years agoMerge pull request #15899 from theanalyst/doc/release-typo
Sage Weil [Sun, 25 Jun 2017 04:16:57 +0000 (23:16 -0500)]
Merge pull request #15899 from theanalyst/doc/release-typo

doc: Luminous release notes typo fixes

8 years agoMerge pull request #15901 from joscollin/wip-CID1412577-Division-or-modulo-by-float...
Jos Collin [Sun, 25 Jun 2017 04:10:32 +0000 (04:10 +0000)]
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>

8 years agoMerge pull request #15900 from smithfarm/wip-docdir-fix
Kefu Chai [Sun, 25 Jun 2017 04:05:20 +0000 (12:05 +0800)]
Merge pull request #15900 from smithfarm/wip-docdir-fix

build/ops: rpm: sane packaging of %{_docdir}/ceph directory

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agomsg/async/rdma: allocated reged mem can be greater than requires len 15903/head
Adir lev [Sun, 28 May 2017 07:37:37 +0000 (10:37 +0300)]
msg/async/rdma: allocated reged mem can be greater than requires len

Change-Id: I3ec42afca39c2ad93fc66ed69b3609b68f315e34
Signed-off-by: Adir lev <adirl@mellanox.com>
8 years agomsg/async/rdma: if failed to send push csi to the back
Adir lev [Sun, 28 May 2017 07:36:02 +0000 (10:36 +0300)]
msg/async/rdma: if failed to send push csi to the back

Change-Id: If6c72917b6e3a836279b86a4d5e9e54383d7b4bd
Signed-off-by: Adir lev <adirl@mellanox.com>
8 years agomon: Division by zero in PGMapDigest::dump_pool_stats_full() 15901/head
Jos Collin [Sat, 24 Jun 2017 14:56:51 +0000 (20:26 +0530)]
mon: Division by zero in PGMapDigest::dump_pool_stats_full()

Fixes The Coverity Scan Report:
CID 1412577 (#1 of 1): Division or modulo by float zero (DIVIDE_BY_ZERO)
35. divide_by_zero: In expression (float)mk / k, division by expression k which may be zero has undefined behavior.

Signed-off-by: Jos Collin <jcollin@redhat.com>
8 years agobuild/ops: rpm: sane packaging of %{_docdir}/ceph directory 15900/head
Nathan Cutler [Sat, 24 Jun 2017 10:27:37 +0000 (12:27 +0200)]
build/ops: rpm: sane packaging of %{_docdir}/ceph directory

91648044163 introduced a build error:

ceph-common-12.1.0+git.1498286248.2fcedc7b3d-1.1.x86_64.rpm: directories not
owned by a package:
 - /usr/share/doc/packages/ceph

The %docdir directive is a way of flagging anything in that directory as being
documentation. It does not actually package the directory. And we don't need
it because we're not dumping a large number of files into this directory.
For more information, see the "Directory-related Directives" section of
http://ftp.rpm.org/max-rpm/s1-rpm-inside-files-list-directives.html

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agodoc: Luminous release notes typo fixes 15899/head
Abhishek Lekshmanan [Sat, 24 Jun 2017 09:29:01 +0000 (11:29 +0200)]
doc: Luminous release notes typo fixes

Suggested-by: Roger Brown <rogerbrown@gmail.com>
Signed-off-by: Abhishek Lekshmanan <alekshmanan@suse.com>
8 years agomgr: remove repeated function log
Yan Jun [Sat, 24 Jun 2017 03:07:21 +0000 (11:07 +0800)]
mgr: remove repeated function log

In the front of this file, '__func__' has been added to dout_prefix as below:

"  #define dout_prefix *_dout << "mgr.server " << __func__ << " "    "

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
8 years agoMerge pull request #15876 from gmayyyha/config-unused-opt 14135/head
Xie Xingguo [Sat, 24 Jun 2017 04:34:12 +0000 (12:34 +0800)]
Merge pull request #15876 from gmayyyha/config-unused-opt

common/config_opts: drop unused opt

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agokv/RocksDBStore: abort if rocksdb EIO, don't return incorrect result 15862/head
Haomai Wang [Fri, 23 Jun 2017 01:36:20 +0000 (09:36 +0800)]
kv/RocksDBStore: abort if rocksdb EIO, don't return incorrect result

If the underlying disk is missing, the current logic won't check the actual
reason why Get/Set failed, it will result to client get a empty key/value
pair which is not expected. The correct logic should be abort
right now. Otherwise, it will leads to undefined behavior.

Signed-off-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #15108 from guihecheng/rgw_file-fix
Matt Benjamin [Sat, 24 Jun 2017 01:10:13 +0000 (21:10 -0400)]
Merge pull request #15108 from guihecheng/rgw_file-fix

rgw_file: fix misuse of make_key_name before make_fhk

8 years agoMerge pull request #15893 from liewegas/wip-valgrind-everywhere
Sage Weil [Fri, 23 Jun 2017 20:25:54 +0000 (15:25 -0500)]
Merge pull request #15893 from liewegas/wip-valgrind-everywhere

qa: do not restrict valgrind runs to centos

8 years agoqa: do not restrict valgrind runs to centos 15893/head
Greg Farnum [Wed, 31 May 2017 15:37:19 +0000 (08:37 -0700)]
qa: do not restrict valgrind runs to centos

This reverts 693bd238510e69569cc3461f84b04c8667bc11da, which was
added in response to http://tracker.ceph.com/issues/18126. But
we updated the Ubuntu packages in sepia so it should be good to go.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #15572 from rzarzynski/wip-rgw-17779
Casey Bodley [Fri, 23 Jun 2017 18:38:09 +0000 (14:38 -0400)]
Merge pull request #15572 from rzarzynski/wip-rgw-17779

rgw: external auth engines of S3 honor rgw_keystone_implicit_tenants.

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agoMerge pull request #14624 from ceph/wip-s3a-hadoop
Casey Bodley [Fri, 23 Jun 2017 17:46:05 +0000 (13:46 -0400)]
Merge pull request #14624 from ceph/wip-s3a-hadoop

qa/tasks: S3A hadoop task to test s3a with Ceph

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoosd: unlock sdata_op_ordering_lock with sdata_lock hold to avoid missing wakeup signal 15891/head
Ming Lin [Fri, 23 Jun 2017 17:28:19 +0000 (10:28 -0700)]
osd: unlock sdata_op_ordering_lock with sdata_lock hold to avoid missing wakeup signal

We are running mysql on top of rbd. sysbench qps occasionally drops to zero
with the INSERT benchmark.

Debug code captured >2s latency between PG::queue_op() and OSD::dequeue_op().
We finally found out that the latency came from below code in OSD::ShardedOpWQ::_process(),

sdata->sdata_cond.WaitInterval(sdata->sdata_lock,
      utime_t(osd->cct->_conf->threadpool_empty_queue_max_wait, 0));

"threadpool_empty_queue_max_wait" is 2s by default.

Normally, it should not sleep for 2s since the comming IO requests will wakeup it.
But there is a small timing window that it missed the wakeup signal actually.
For example,

     msgr-worker-0 thread                    tp_osd_tp thread
     OSD::ShardedOpWQ::_enqueue              OSD::ShardedOpWQ::_process
     ---------------------------             ---------------------------
T1:                                          sdata_op_ordering_lock.Lock()
T2:  sdata_op_ordering_lock.Lock()
                                             "queue empty"
                                             sdata_op_ordering_lock.Unlock()
     "insert op"
     sdata_op_ordering_lock.Unlock()

T3:  sdata_lock.Lock()
T4:                                          sdata_lock.Lock()
     "send wakeup signal"
     sdata_lock.Unock()
                                             // here the wakeup signal has no effect actually
                                             // becuase it has not slept yet.

                                             // then, it sleeps.
                                             WaitInterval(2s)

This patch unlocks sdata_op_ordering_lock with sdata_lock hold in OSD::ShardedOpWQ::_process(),
then the timeline becomes,

     msgr-worker-0 thread                    tp_osd_tp thread
     OSD::ShardedOpWQ::_enqueue              OSD::ShardedOpWQ::_process
     ---------------------------             ---------------------------
T1:                                          sdata_op_ordering_lock.Lock()
T2:  sdata_op_ordering_lock.Lock()
                                             "queue empty"
                                             sdata_lock.Lock()
T3:                                          sdata_op_ordering_lock.Unlock()
     "insert op"
     sdata_op_ordering_lock.Unlock()
     sdata_lock.Lock()

T4:                                          WaitInterval(2s) -> it actually unlocks sdata_lock
     "send wakeup signal"
     sdata_lock.Unock()
                                             //got signal, wakeup immediately

With this one line change, we can avoid occasional high latency.

Signed-off-by: Ming Lin <ming.lin@alibaba-inc.com>