Commit Graph

77661 Commits

Author SHA1 Message Date
Sage Weil
e835457be4 os/bluestore: drop kraken wal replay compat
Signed-off-by: Sage Weil <sage@redhat.com>
2017-08-28 23:10:32 -04:00
Sage Weil
1f680c3e96 osd: remove MOSDSubOp[Reply] jewel compat code
Signed-off-by: Sage Weil <sage@redhat.com>
2017-08-28 23:10:32 -04:00
Sage Weil
0ccd074398 osd: require_osd_release >= luminous
We can drop the luminous mon check now because the
require_osd_release cannot be set to luminous with pre-l mons
anyway.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-08-28 23:10:32 -04:00
Sage Weil
a33d0ef3f1 Merge pull request #17146 from shangzhong/wip-add-line-break
common: add line break for "ceph daemon TYPE.ID version"

Reviewed-by: huanwen ren <ren.huanwen@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-28 21:58:28 -05:00
Sage Weil
cc7c9e9ee4 Merge pull request #17091 from liupan1111/wip-txc-add
os/bluestore: support calculate cost when using spdk.

Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-08-28 21:56:32 -05:00
Sage Weil
fc72223fa1 Merge pull request #17251 from Songweibin/wip-unused-variable
os/bluestore: drop unused param "what" in apply()

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-28 21:55:52 -05:00
xie xingguo
2ee80aead8 mon/OSDMonitor: make 'osd crush class rename' idempotent
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-29 10:43:35 +08:00
Kefu Chai
219183e2fb test/unittest_pg_log: silence gcc warning
this silences following warning:

In file included from ceph/src/test/osd/TestPGLog.cc:24:0:
ceph/src/googletest/googletest/include/gtest/gtest.h:430:16:
warning: ‘virtual void testing::Test::SetUp()’ was hidden
[-Woverloaded-virtual]
   virtual void SetUp();
                ^~~~~
ceph/src/test/osd/TestPGLog.cc:2703:8: warning:   by ‘void
PGLogTrimTest::SetUp(unsigned int, unsigned int, unsigned int)’
[-Woverloaded-virtual]
   void SetUp(unsigned min_entries, unsigned max_entries, unsigned
dup_track) {
        ^~~~~

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-08-29 10:16:58 +08:00
Kefu Chai
4a506f565e Merge pull request #17326 from neha-ojha/wip-21023-contd
doc: fix order of options in osd new

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-29 10:02:55 +08:00
Kefu Chai
958c8480ea Merge pull request #17180 from tchaikov/wip-literals-for-options
common/options: use user-defined literals for default values

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
2017-08-29 09:25:33 +08:00
Kefu Chai
4324ad9955 Merge pull request #16066 from tanghaodong25/bluefs-sync-write
os/bluestore/BlueFS: don't need wait for aio when using _sync_write

Reviewed-by: Sage Weil <sage@redhat.com>
2017-08-29 09:12:47 +08:00
Kefu Chai
a8124b1c6f Merge pull request #15479 from yonghengdexin735/wip-zzz-const
messages/MDentryLink: add const to member function

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-29 09:11:58 +08:00
Kefu Chai
9c1c2dde22 Merge pull request #17256 from scienceluo/wip-luo-add-log-branch
auth: add err reason for log info in load function

Reviewed-by: Sage Weil <sage@redhat.com>
2017-08-29 09:11:22 +08:00
Yanhu Cao
cb26eead3f mgr/Mgr: implement completion of osd MetadataUpdate
Fixes: http://tracker.ceph.com/issues/21159

Signed-off-by: Yanhu Cao <gmayyyha@gmail.com>
2017-08-29 08:44:01 +08:00
xie xingguo
cd2191c3f1 mon/OSDMonitor: make 'osd crush rule rename' idempotent
Fixes: http://tracker.ceph.com/issues/21162
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-29 08:29:13 +08:00
Neha Ojha
e474630289 doc: fix order of options in osd new
Signed-off-by: Neha Ojha <nojha@redhat.com>
2017-08-28 15:59:19 -07:00
Sage Weil
df3fe608b8 Merge pull request #17307 from liewegas/wip-powercycle-slow-trim
qa/suites/powercycle/osd/whitelist_health: whitelist slow trimming
2017-08-28 13:14:16 -05:00
Sage Weil
5235f35ac8 qa/suites/powercycle/osd/whitelist_health: whitelist more
"2017-08-26 16:09:27.704418 mon.a mon.0 172.21.15.169:6789/0 876 : cluster [WRN] MDS health message (mds.0): Behind on trimming (66/30)" in cluster log

Signed-off-by: Sage Weil <sage@redhat.com>
2017-08-28 13:58:02 -04:00
John Spray
bc2daa6ee9 Merge pull request #16857 from yanyixing/chartfix
pybind: fix chart size become bigger when refresh

Reviewed-by: John Spray <john.spray@redhat.com>
2017-08-28 18:28:34 +01:00
amitkuma
cef851b757 os: Removing dead code from LFNIndex.cc
Fixes the coverity issue:

** 1394832 Logically dead code
cannot_single: At condition r, the value of r
cannot be equal to 0.
dead_error_condition: The condition r must be true.
CID 1394832 (#1 of 1): Logically dead code (DEADCODE)
dead_error_line: Execution cannot reach the expression
-22 inside this statement: return r ? 0 : -22;.

Signed-off-by: Amit Kumar <amitkuma@redhat.com>
2017-08-28 22:16:18 +05:30
Ning Yao
dddae89fa7 os:kstore fix unittest for FiemapHole
kstore always return [0, object_size] regardless of offset and length

Signed-off-by: Ning Yao <yaoning@unitedstack.com>
2017-08-28 15:51:05 +00:00
amitkuma
f74221b3a8 test: Check to avoid divide by zero
Fixes the coverity issue:

** 1219467 Division or modulo by zero
CID 1219467 (#1 of 1): Division or modulo by zero (DIVIDE_BY_ZERO)
74. divide_by_zero: In expression 100 / atoi(args[i + 1U]), division
 by expression atoi(args[i + 1U]) which may be zero has undefined behavior.

Signed-off-by: Amit Kumar amitkuma@redhat.com
2017-08-28 21:19:17 +05:30
amitkuma
99d4f0857a test: assert check for negetive returns
Fixes the coverity issue:

** 1395371 Argument cannot be negative
1. negative_return_fn: Function open(file, 578, 448) returs a negative number.
2. var_assign: Assigning: signed variable fd = open

** 1395427 Argument cannot be negative
1. negative_return_fn: Function open(file, 578, 448) returns a negative number.
2. var_assign: Assigning: signed variable fd = open

Signed-off-by: Amit Kumar <amitkuma@redhat.com>
2017-08-28 21:13:37 +05:30
Matt Benjamin
315e419181 Merge pull request #17267 from linuxbox2/wip-lock-qlane
rgw_file:  fix LRU lane lock in evict_block()
2017-08-28 11:01:03 -04:00
huangjun
56e8031dac mon: use ceph_clock_now if message is self-generated
Signed-off-by: huangjun <huangjun@xsky.com>
2017-08-28 22:52:37 +08:00
John Spray
5fa61b2ed0 mgr: fix crash in MonCommandCompletion
Fixes: http://tracker.ceph.com/issues/21157
Signed-off-by: John Spray <john.spray@redhat.com>
2017-08-28 10:10:08 -04:00
Sage Weil
0f5da4afc1 Merge pull request #17293 from tchaikov/wip-jewel-x-singleton
qa/suites/rados/upgrade/jewel-x-singleton: tolerate sloppy past_intervals

Reviewed-by: Sage Weil <sage@redhat.com>
2017-08-28 08:55:18 -05:00
Kefu Chai
4fba9c0ee2 Merge pull request #17019 from dachary/wip-doc-ceph-disk
doc: document ceph-disk prepare class hierarchy

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-28 19:17:33 +08:00
Kefu Chai
3f75436b2d rgw: silence clang analyzer warning
silences following warning:

Value stored to 'versioned_dest' is never read

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-08-28 17:09:16 +08:00
Kefu Chai
bceafe0607 unittest_bit_alloc: silence clang analyzer warning
silences following warning:

Value stored to 'allocated' is never read

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-08-28 17:03:34 +08:00
Kefu Chai
b2d7f4f4c7 qa/suites/rados/upgrade/jewel-x-singleton: tolerate sloppy past_intervals
See-also: d5d5d7d1
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-08-28 15:19:41 +08:00
Pan Liu
0bef6c7753 Merge pull request #17284 from liupan1111/wip-nvme-cleanup
bluestore/NVMEDevice: code cleanup
2017-08-28 10:01:58 +08:00
Xie Xingguo
3e0506a9a5 Merge pull request #17253 from hjwsm1989/fix-qa-bug
qa: fix the potential delay of pg state change

Reviewed-by: Sage Weil <sage@redhat.com>
2017-08-28 08:35:01 +08:00
Haomai Wang
df6684b0ca msg/async: don't kill connection if replacing
when existing connection is replacing, then meet send error, we can't kill
this existing connection. otherwise, when peer side reconnect, we will detect
reset condition and send resetsession to make peer discard messages.

Fixes: http://tracker.ceph.com/issues/21143
Signed-off-by: Haomai Wang <haomai@xsky.com>
2017-08-27 13:39:35 -07:00
Pan Liu
54383e8bd9 bluestore/NVMEDevice: remove useless IOSegment, and set
dpdk_thread_adaptor as static.

Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
Signed-off-by: Ziye Yang <optimistyzy@intel.com>
2017-08-27 23:23:00 +08:00
Pan Liu
8b80a9ba7d bluestore/NVMEDevice: remove useless aio_stop in class NVMEDevice
Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
Signed-off-by: Ziye Yang <optimistyzy@gmail.com>
2017-08-27 23:06:55 +08:00
Pan Liu
455e7435f7 os/bluestore/NVMEDevice: remove not used BufferedExtents.
Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
Signed-off-by: Ziye Yang <optimistyzy@gmail.com>
2017-08-27 23:03:15 +08:00
Pan Liu
622e90edd2 rbd-nbd: don't need call "stop()" seperately, and ~NBDServer will do it.
Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
2017-08-27 20:45:10 +08:00
Jason Dillaman
fc0646fa6d Merge pull request #17055 from dillaman/wip-21017
mgr/dashboard: fix duplicate images listed on iSCSI status page

Reviewed-by: John Spray <john.spray@redhat.com>
2017-08-27 08:39:18 -04:00
Jason Dillaman
f2092a9d32 Merge pull request #17216 from Yan-waller/wip-walle-0824imagectx
test/librbd: fix mock method macro of set_journal_policy

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-08-27 08:33:35 -04:00
Haomai Wang
4be0235d74 msg/async: don't stuck into resetsession/retrysession loop
if exist connection's connect_seq is zero and state is STANDBY and peer
connection is new, we will reply with RETRYSESSION and make peer connection
incr connect_seq. Then we receive connect.connect_seq==1, but
existing->connect_seq is still zero, so RESETSESSION tag replied.

RESET->RETRY->RESET loop is forever

Signed-off-by: Haomai Wang <haomai@xsky.com>
2017-08-26 22:09:54 -07:00
Sage Weil
64dcb9c3d0 Merge pull request #17275 from ceph/revert-17268-wip-21089
Revert "os/bluestore: compensate for bad freelistmanager size/blocks metadata"

Reviewed-by: Sage Weil <sage@redhat.com>
2017-08-26 21:22:04 -05:00
Kefu Chai
30b5b4627c Merge pull request #16494 from asomers/bin_bash
misc: Fix bash path in shebangs

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-27 10:14:14 +08:00
Xie Xingguo
303d5b34a5 Revert "os/bluestore: compensate for bad freelistmanager size/blocks metadata" 2017-08-27 10:12:46 +08:00
Xie Xingguo
dbe1e6ed6c Merge pull request #17268 from liewegas/wip-21089
os/bluestore: compensate for bad freelistmanager size/blocks metadata

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-27 09:38:14 +08:00
Xie Xingguo
d0402b1175 Merge pull request #17271 from xiexingguo/wip-ls-by-class
mon/MonCommands: fix copy-and-paste error

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-27 09:36:09 +08:00
Xie Xingguo
df81aa4643 Merge pull request #17272 from scienceluo/wip-luo-silence-buiding-warning-branch
common: silence jenkins's buiding warning in obj_bencher.cc

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-27 09:34:58 +08:00
Pan Liu
82e7dee3ff Merge pull request #17200 from optimistyzy/823_queue_depth
os/bluestore/NVMEDevice: fix the nvme queue depth issue
2017-08-26 22:29:54 +08:00
Kefu Chai
e3fce6be44 osd/PG: discard msgs from down peers
if a repop is replied after a replica goes down in a new osdmap, and
before the pg advances to this new osdmap, the repop replies before this
repop can be discarded by that replica OSD, because the primary resets the
connection to it when handling the new osdmap marking it down, and also
resets the messenger sesssion when the replica reconnects. to avoid the
out-of-order replies, the messages from that replica should be discarded.

Fixes: http://tracker.ceph.com/issues/19605
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-08-26 18:28:28 +08:00
Luo Kexue
6ed6883b49 common: silence jenkins's buiding warning in obj_bencher.cc
Signed-off-by: Luo Kexue <luo.kexue@zte.com.cn>
2017-08-26 10:58:39 +08:00