]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agodoc/dev/perf_counters: update docs for new friendly properties 14933/head
Sage Weil [Mon, 15 May 2017 03:04:37 +0000 (22:04 -0500)]
doc/dev/perf_counters: update docs for new friendly properties

Note that histograms are not yet documented.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocommon/perf_counters: rename histogram adder method
Sage Weil [Wed, 3 May 2017 13:25:45 +0000 (08:25 -0500)]
common/perf_counters: rename histogram adder method

Specifically, it's a u64 counter histogram.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocommon/perf_counters: make 'perf schema' more friendly
Sage Weil [Wed, 3 May 2017 13:24:45 +0000 (08:24 -0500)]
common/perf_counters: make 'perf schema' more friendly

The raw bits are pretty hard to interpret and the documentation isn't
super easy to find.  Expose a string description instead.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocommon/perf_counters: histograms are counters
Sage Weil [Wed, 3 May 2017 02:11:35 +0000 (21:11 -0500)]
common/perf_counters: histograms are counters

The histogram is a histogram of counters (not guages), so set the COUNTER
bit.  (This only matters because we expose and document the bits of the
type, for better for for worse.)

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #13111 from cbodley/wip-rgw-mdlog-trim
Yehuda Sadeh [Fri, 12 May 2017 14:12:17 +0000 (07:12 -0700)]
Merge pull request #13111 from cbodley/wip-rgw-mdlog-trim

rgw multisite: automated mdlog trimming

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoMerge pull request #15004 from liewegas/wip-19880
Kefu Chai [Fri, 12 May 2017 11:45:01 +0000 (19:45 +0800)]
Merge pull request #15004 from liewegas/wip-19880

os/bluestore: fix deferred write race

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #15029 from xiexingguo/wip-bluestore-20170510
Kefu Chai [Fri, 12 May 2017 11:40:59 +0000 (19:40 +0800)]
Merge pull request #15029 from xiexingguo/wip-bluestore-20170510

os/bluestore: pre-calculate number of ghost buffers to evict

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15012 from tchaikov/wip-byteswap
Kefu Chai [Fri, 12 May 2017 11:40:02 +0000 (19:40 +0800)]
Merge pull request #15012 from tchaikov/wip-byteswap

byteorder: use gcc intrinsics for byteswap

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15019 from badone/wip-redundant-headers-2
Kefu Chai [Fri, 12 May 2017 11:38:28 +0000 (19:38 +0800)]
Merge pull request #15019 from badone/wip-redundant-headers-2

common: Remove redundant includes

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15040 from tchaikov/wip-19902
Kefu Chai [Fri, 12 May 2017 11:36:02 +0000 (19:36 +0800)]
Merge pull request #15040 from tchaikov/wip-19902

osd/PrimaryLogPG: do not call on_shutdown() if (pg.deleting)

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15009 from tchaikov/wip-kill-warnings
Kefu Chai [Fri, 12 May 2017 11:34:13 +0000 (19:34 +0800)]
Merge pull request #15009 from tchaikov/wip-kill-warnings

libradosstriper: do not assign garbage to returned value

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
8 years agoMerge pull request #14940 from ceph/wip-radosgw-admin-package-move
Kefu Chai [Fri, 12 May 2017 11:06:09 +0000 (19:06 +0800)]
Merge pull request #14940 from ceph/wip-radosgw-admin-package-move

debian/rpm: move radosgw-admin to ceph-common

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #13610 from liewegas/wip-snapset
Sage Weil [Fri, 12 May 2017 02:18:11 +0000 (21:18 -0500)]
Merge pull request #13610 from liewegas/wip-snapset

osd: eliminate snapdir objects and move clone snaps vector into SnapSet

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #15056 from liewegas/wip-fix-osdmap-comment
Sage Weil [Thu, 11 May 2017 22:30:27 +0000 (17:30 -0500)]
Merge pull request #15056 from liewegas/wip-fix-osdmap-comment

osd/OSDMap: fix feature commit comment

8 years agoosd/OSDMap: fix feature commit comment 15056/head
Sage Weil [Thu, 11 May 2017 22:28:36 +0000 (17:28 -0500)]
osd/OSDMap: fix feature commit comment

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #10260 from weiqiaomiao/wqm-wip-clean-opstate
Casey Bodley [Thu, 11 May 2017 16:01:26 +0000 (12:01 -0400)]
Merge pull request #10260 from weiqiaomiao/wqm-wip-clean-opstate

rgw: clean unuse code in cls_statelog_check_state

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #14411 from mikulely/rgw-cleanup-rados
Casey Bodley [Thu, 11 May 2017 15:59:23 +0000 (11:59 -0400)]
Merge pull request #14411 from mikulely/rgw-cleanup-rados

rgw: rgw_rados drop deprecated global var

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #14906 from mikulely/lc-cleanup-2
Casey Bodley [Thu, 11 May 2017 15:58:38 +0000 (11:58 -0400)]
Merge pull request #14906 from mikulely/lc-cleanup-2

rgw: cleanup lc continuation

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
8 years agoMerge pull request #15010 from shashalu/fix-bucket-create
Casey Bodley [Thu, 11 May 2017 15:56:02 +0000 (11:56 -0400)]
Merge pull request #15010 from shashalu/fix-bucket-create

rgw: when create_bucket use the same num_shards with info.num_shards

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #15017 from dillaman/wip-19863
Sage Weil [Thu, 11 May 2017 15:17:15 +0000 (10:17 -0500)]
Merge pull request #15017 from dillaman/wip-19863

common/bit_vector: utilize deep-copy during data decode

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14743 from ukernel/wip-19635
John Spray [Thu, 11 May 2017 09:46:41 +0000 (10:46 +0100)]
Merge pull request #14743 from ukernel/wip-19635

mds: issue new caps when sending reply to client

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14704 from batrick/i19589
John Spray [Thu, 11 May 2017 09:12:22 +0000 (10:12 +0100)]
Merge pull request #14704 from batrick/i19589

mds: fix mantle script to not fail for last rank

Reviewed-by: Michael Sevilla <mikesevilla3@gmail.com>
8 years agoMerge pull request #14921 from batrick/ptrwaiter-balance
Yan, Zheng [Thu, 11 May 2017 06:10:12 +0000 (14:10 +0800)]
Merge pull request #14921 from batrick/ptrwaiter-balance

mds: relocate PTRWAITER put near get

8 years agoosd/PrimaryLogPG: do not call on_shutdown() if (pg.deleting) 15040/head
Kefu Chai [Thu, 11 May 2017 05:13:39 +0000 (13:13 +0800)]
osd/PrimaryLogPG: do not call on_shutdown() if (pg.deleting)

when a callback is called, it could be facing a PG already shut down by
OSD. but if that callback wants to shut that PG down. it should check
the PG's status first.

Fixes: http://tracker.ceph.com/issues/19902
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14598 from batrick/mds-balancer-pin
Yan, Zheng [Thu, 11 May 2017 03:56:34 +0000 (11:56 +0800)]
Merge pull request #14598 from batrick/mds-balancer-pin

mds: support export pinning on directories

8 years agocommon: Remove redundant includes 15019/head
Brad Hubbard [Wed, 10 May 2017 01:20:35 +0000 (11:20 +1000)]
common: Remove redundant includes

Fixes: http://tracker.ceph.com/issues/19883 (Partially)
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
8 years agomds: delay export until dir is stable 14598/head
Patrick Donnelly [Wed, 10 May 2017 20:56:06 +0000 (16:56 -0400)]
mds: delay export until dir is stable

This catches an assertion failure due to exports on unjournaled directories:

    2017-05-10 12:45:18.193640 7eff65a04700  7 mds.0.migrator export_dir [dir 10000000003 /a/ [2,head] auth pv=3 v=1 cv=0/0 ap=1+2+2 state=1073742082|complete f()->f(v0 m2017-05-10 12:45:14.977151 1=0+1) n()->n(v0 rc2017-05-10 12:45:14.977151 1=0+1) hs=0+1,ss=0+0 | child=1 authpin=1 0x55ef655de000] to 1
    2017-05-10 12:45:18.193654 7eff65a04700 15 mds.0.18 hit export target 10 @ 2017-05-10 12:45:18.193653
    2017-05-10 12:45:18.193661 7eff65a04700 10 mds.0.cache.dir(10000000003) auth_pin by 0x55ef650cc130 on [dir 10000000003 /a/ [2,head] auth pv=3 v=1 cv=0/0 ap=2+2+2 state=1073742082|complete f()->f(v0 m2017-05-10 12:45:14.977151 1=0+1) n()->n(v0 rc2017-05-10 12:45:14.977151 1=0+1) hs=0+1,ss=0+0 | child=1 authpin=1 0x55ef655de000] count now 2 + 2
    2017-05-10 12:45:18.193701 7eff65a04700  7 mds.0.cache request_start_internal request(mds.0:4) op 5377
    2017-05-10 12:45:18.193708 7eff65a04700  7 mds.0.migrator dispatch_export_dir request(mds.0:4)
    2017-05-10 12:45:18.198281 7eff66205700 20 mgrc operator() 234 counters, of which 0 new
    2017-05-10 12:45:18.198294 7eff66205700 20 mgrc send_report encoded 2006 bytes
    2017-05-10 12:45:18.198298 7eff66205700  1 -- 127.0.0.1:6825/693985647 --> 127.0.0.1:6826/1025 -- mgrreport(+0-0 packed 2006) v2 -- 0x55ef655abe00 con 0
    2017-05-10 12:45:18.198364 7eff6a9ab700 10 _calc_signature seq 14 front_crc_ = 2388339344 middle_crc = 0 data_crc = 0 sig = 5026349537430007662
    2017-05-10 12:45:18.198376 7eff6a9ab700 20 Putting signature in client message(seq # 14): sig = 5026349537430007662
    2017-05-10 12:45:18.198411 7eff65a04700 -1 /home/pdonnell/ceph/src/mds/MDCache.cc: In function 'void MDCache::make_trace(std::vector<CDentry*>&, CInode*)' thread 7eff65a04700 time 2017-05-10 12:45:18.194136
    /home/pdonnell/ceph/src/mds/MDCache.cc: 8225: FAILED assert(parent)

     ceph version 12.0.1-2198-ge757c02 (e757c025fa3270b12fb2fca17cf159fa1bd72747)
     1: (ceph::__ceph_assert_fail(char const*, char const*, int, char const*)+0x102) [0x55ef5b780f02]
     2: (MDCache::make_trace(std::vector<CDentry*, std::allocator<CDentry*> >&, CInode*)+0x1cb) [0x55ef5b4fa12b]
     3: (Migrator::get_export_lock_set(CDir*, std::set<SimpleLock*, std::less<SimpleLock*>, std::allocator<SimpleLock*> >&)+0x55) [0x55ef5b5e8215]
     4: (Migrator::dispatch_export_dir(boost::intrusive_ptr<MDRequestImpl>&, int)+0xa74) [0x55ef5b5f72d4]
     5: (Migrator::export_dir(CDir*, int)+0x9ca) [0x55ef5b5ea75a]
     6: (MDBalancer::handle_export_pins()+0x7b4) [0x55ef5b61ab24]
     7: (MDBalancer::tick()+0x1e8) [0x55ef5b61b748]
     8: (MDSRankDispatcher::tick()+0x5f1) [0x55ef5b44bdb1]
     9: (Context::complete(int)+0x9) [0x55ef5b43bcc9]
     10: (SafeTimer::timer_thread()+0x452) [0x55ef5b77dd52]
     11: (SafeTimerThread::entry()+0xd) [0x55ef5b77f15d]
     12: (()+0x76ba) [0x7eff6d4bb6ba]
     13: (clone()+0x6d) [0x7eff6c52782d]

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agobyteorder: refactor ceph_le{16,32,64} using template 15012/head
Kefu Chai [Tue, 9 May 2017 08:08:49 +0000 (16:08 +0800)]
byteorder: refactor ceph_le{16,32,64} using template

to improve the readablity and easier for debugging.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agobyteorder: use gcc intrinsics for byteswap
Kefu Chai [Tue, 9 May 2017 06:41:41 +0000 (14:41 +0800)]
byteorder: use gcc intrinsics for byteswap

* use gcc intrinsics for byteswap
* use template to wrap them.
* add the modeline for emacs/vim
* update the caller of the mswab/swab accordingly

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoradosstriper: do not use GCC extension to initialize struct members
Kefu Chai [Tue, 9 May 2017 16:32:11 +0000 (00:32 +0800)]
radosstriper: do not use GCC extension to initialize struct members

it's obsolete since GCC 2.5 and is not portable. see
https://gcc.gnu.org/onlinedocs/gcc/Designated-Inits.html

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agobyteorder: remove the cruft to detect endianness
Kefu Chai [Tue, 9 May 2017 06:53:24 +0000 (14:53 +0800)]
byteorder: remove the cruft to detect endianness

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agocommon/sctp_crc32: include acconfig.h for the detecting endianness
Kefu Chai [Tue, 9 May 2017 07:04:02 +0000 (15:04 +0800)]
common/sctp_crc32: include acconfig.h for the detecting endianness

so byteorder.h can be a pure c++ header.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agocmake: use cmake module to detect endianness
Kefu Chai [Tue, 9 May 2017 06:52:58 +0000 (14:52 +0800)]
cmake: use cmake module to detect endianness

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15030 from chardan/jfw-wip-halflife_atomic_t-fix-compare_exchange...
Jason Dillaman [Wed, 10 May 2017 14:04:45 +0000 (10:04 -0400)]
Merge pull request #15030 from chardan/jfw-wip-halflife_atomic_t-fix-compare_exchange_weak

tools: change compare_exchange_weak to compare_exchange_strong

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14975 from runsisi/wip-io-logging
Jason Dillaman [Wed, 10 May 2017 14:00:56 +0000 (10:00 -0400)]
Merge pull request #14975 from runsisi/wip-io-logging

librbd: cleanup logging code under librbd/io

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14905 from johnzzpcrystal/aio
Sage Weil [Wed, 10 May 2017 13:16:13 +0000 (08:16 -0500)]
Merge pull request #14905 from johnzzpcrystal/aio

test/fsx:  Remove the dead code associated with aio backend

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14911 from ovh/bp-small-enc-eradication
Sage Weil [Wed, 10 May 2017 13:15:16 +0000 (08:15 -0500)]
Merge pull request #14911 from ovh/bp-small-enc-eradication

os/bluestore: use denc for varint encoding

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14957 from ovh/bp-crc-cache-miss-counter
Sage Weil [Wed, 10 May 2017 13:14:27 +0000 (08:14 -0500)]
Merge pull request #14957 from ovh/bp-crc-cache-miss-counter

buffer, osd: add missing crc cache miss perf counter

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14996 from xiexingguo/wip-fix-dump_basic
Sage Weil [Wed, 10 May 2017 13:14:09 +0000 (08:14 -0500)]
Merge pull request #14996 from xiexingguo/wip-fix-dump_basic

mon/PGMap.cc: fix "osd_epochs" section of dump_basic

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15003 from badone/wip-redundant-headers
Sage Weil [Wed, 10 May 2017 13:13:50 +0000 (08:13 -0500)]
Merge pull request #15003 from badone/wip-redundant-headers

common: Remove redundant includes

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15013 from TsaiJin/wip-pg-lock-cleanup
Sage Weil [Wed, 10 May 2017 13:12:48 +0000 (08:12 -0500)]
Merge pull request #15013 from TsaiJin/wip-pg-lock-cleanup

osd/PG.cc: unify the call of checking whether lock is held

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14937 from SpandanKumarSahu/bug#17453
Sage Weil [Wed, 10 May 2017 12:21:02 +0000 (07:21 -0500)]
Merge pull request #14937 from SpandanKumarSahu/bug#17453

mgr: remove non-existent MDS daemons from FSMap

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
8 years agolibrbd: cleanup logging code under librbd/io 14975/head
runsisi [Fri, 5 May 2017 11:01:37 +0000 (19:01 +0800)]
librbd: cleanup logging code under librbd/io

Signed-off-by: runsisi <runsisi@zte.com.cn>
8 years agotools: change compare_exchange_weak to compare_exchange_strong 15030/head
Jesse Williamson [Wed, 10 May 2017 11:04:25 +0000 (04:04 -0700)]
tools: change compare_exchange_weak to compare_exchange_strong

On non x86 platforms without a dedicated compare-exchange instruction, std::compare_exchange_weak()
could fail.

Signed-off-by: Jesse Williamson <jwilliamson@suse.de>
8 years agoos/bluestore: pre-calculate number of ghost buffers to evict 15029/head
xie xingguo [Wed, 10 May 2017 11:01:49 +0000 (19:01 +0800)]
os/bluestore: pre-calculate number of ghost buffers to evict

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #15016 from dachary/wip-19888-ceph-disk
Loic Dachary [Wed, 10 May 2017 08:04:17 +0000 (10:04 +0200)]
Merge pull request #15016 from dachary/wip-19888-ceph-disk

ceph-disk: separate ceph-osd --check-needs-* logs

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
8 years agorgw: when create_bucket use the same num_shards with info.num_shards 15010/head
lu.shasha [Tue, 9 May 2017 07:05:03 +0000 (15:05 +0800)]
rgw: when create_bucket use the same num_shards with info.num_shards

pr #14388 only fix the num_shards in BucketInfo, "init_bucket_index" function still use local num_shards

Fixes: http://tracker.ceph.com/issues/19745
Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>
8 years agolibradosstriper: do not assign garbage to returned value 15009/head
Kefu Chai [Tue, 9 May 2017 04:56:59 +0000 (12:56 +0800)]
libradosstriper: do not assign garbage to returned value

if `rc` is not zero, the returned `ssize` is either garbage or
undefined. this silences warning from clang analyzer:

Assigned value is garbage or undefined

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agotest/messenger/simple*: throw when fails to malloc
Kefu Chai [Tue, 9 May 2017 04:52:43 +0000 (12:52 +0800)]
test/messenger/simple*: throw when fails to malloc

silences the warning of "Null pointer passed as an argument to a
'nonnull' parameter" from clang analyzer.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14854 from ceph/wip-reduce-smoke
Sage Weil [Tue, 9 May 2017 17:38:21 +0000 (12:38 -0500)]
Merge pull request #14854 from ceph/wip-reduce-smoke

qa/suites: Reduce fs combination tests for smoke, use bluestore

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14959 from liewegas/wip-crush-compat
Sage Weil [Tue, 9 May 2017 16:42:30 +0000 (11:42 -0500)]
Merge pull request #14959 from liewegas/wip-crush-compat

mon,osd: add require_min_compat_client setting to enforce and clarify client compatibility

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agotest/cli: fix cli tests 14959/head
Sage Weil [Tue, 9 May 2017 16:34:15 +0000 (11:34 -0500)]
test/cli: fix cli tests

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon/OSDMonitor: 'osd set-require-min-compat-client ...'
Sage Weil [Thu, 4 May 2017 18:35:45 +0000 (13:35 -0500)]
mon/OSDMonitor: 'osd set-require-min-compat-client ...'

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoqa/releases/luminous: set require_min_compat_client after upgrade
Sage Weil [Mon, 8 May 2017 21:45:49 +0000 (17:45 -0400)]
qa/releases/luminous: set require_min_compat_client after upgrade

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoqa/suites: set initial require_min_compat_client
Sage Weil [Thu, 4 May 2017 18:11:27 +0000 (13:11 -0500)]
qa/suites: set initial require_min_compat_client

For cases where we are selecting crush tunables beyond the default
min of hammer.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd/OSDMap: add CRUSH_CHOOSEARGS feature bit
Sage Weil [Thu, 4 May 2017 17:41:14 +0000 (12:41 -0500)]
osd/OSDMap: add CRUSH_CHOOSEARGS feature bit

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocrush/CrushWrapper: has_[incompat_]chooseargs()
Sage Weil [Thu, 4 May 2017 17:40:42 +0000 (12:40 -0500)]
crush/CrushWrapper: has_[incompat_]chooseargs()

We'll use this for feature bit compat checks with clients and osds.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoinclude/ceph_features: rename OSDMAP_REMAP -> OSDMAP_PG_UPMAP
Sage Weil [Thu, 4 May 2017 17:33:59 +0000 (12:33 -0500)]
include/ceph_features: rename OSDMAP_REMAP -> OSDMAP_PG_UPMAP

Missed this with the remap -> upmap rename a few weeks back.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon/OSDMonitor: prevent injection of crush map violating require_min_compat_client
Sage Weil [Thu, 4 May 2017 17:24:27 +0000 (12:24 -0500)]
mon/OSDMonitor: prevent injection of crush map violating require_min_compat_client

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon/OSDMonitor: drop allow_pg_upmap option; use require_min_compat_client instead
Sage Weil [Thu, 4 May 2017 17:20:33 +0000 (12:20 -0500)]
mon/OSDMonitor: drop allow_pg_upmap option; use require_min_compat_client instead

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon/OSDMonitor: switch primary-{affinity,temp} checks to require_min_compat_client
Sage Weil [Thu, 4 May 2017 17:19:13 +0000 (12:19 -0500)]
mon/OSDMonitor: switch primary-{affinity,temp} checks to require_min_compat_client

If require_min_compat_client is set (we've finished luminous upgrade), use
that to enforce primary_temp and primary_affinity settings.  Otherwise,
use the legacy config option.

Drop the assert in update_from_paxos.

After luminous we can remove the config options entirely.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon/OSDMonitor: set OSDMap require_min_compat_client on upgrade
Sage Weil [Thu, 4 May 2017 17:11:23 +0000 (12:11 -0500)]
mon/OSDMonitor: set OSDMap require_min_compat_client on upgrade

Fill in this field once require_luminous is set.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocrush: move default tunables up to hammer
Sage Weil [Thu, 4 May 2017 17:07:35 +0000 (12:07 -0500)]
crush: move default tunables up to hammer

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon/OSDMonitor: default require_min_compat_client to hammer for new clusters
Sage Weil [Thu, 4 May 2017 17:06:37 +0000 (12:06 -0500)]
mon/OSDMonitor: default require_min_compat_client to hammer for new clusters

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd/OSDmap: add require_min_compat_client field
Sage Weil [Thu, 4 May 2017 17:04:19 +0000 (12:04 -0500)]
osd/OSDmap: add require_min_compat_client field

This is a persistent record of the compatibility for old clients that
we will enforce.  Once set, the mon will eventually prevent newer features
of the OSDMap or CRUSH maps from being used if they violate this
requirement.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd/OSDMap: get_min_compat_client()
Sage Weil [Thu, 4 May 2017 17:02:28 +0000 (12:02 -0500)]
osd/OSDMap: get_min_compat_client()

Calculate the oldest client we allow to connect.  Provide both a release
name (e.g., firefly) and a version string (e.g., "0.80").

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocommon/bit_vector: utilize deep-copy during data decode 15017/head
Jason Dillaman [Tue, 9 May 2017 15:31:52 +0000 (11:31 -0400)]
common/bit_vector: utilize deep-copy during data decode

BlueStore utilizes an in-memory cache of bufferlists. If the bit vector
directly manipulates the shallow-copied bufferlist, it can corrupt
the CRC.

Fixes: http://tracker.ceph.com/issues/19863
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #15015 from smithfarm/wip-sphinx
Nathan Cutler [Tue, 9 May 2017 15:17:23 +0000 (17:17 +0200)]
Merge pull request #15015 from smithfarm/wip-sphinx

build/ops: rpm: fix python-Sphinx package name for SUSE

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
8 years agoMerge pull request #14952 from tchaikov/wip-19813
Sage Weil [Tue, 9 May 2017 15:01:12 +0000 (10:01 -0500)]
Merge pull request #14952 from tchaikov/wip-19813

mgr: do the shutdown in the right order

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14478 from theanalyst/doc/dev/ccache
Kefu Chai [Tue, 9 May 2017 12:46:29 +0000 (20:46 +0800)]
Merge pull request #14478 from theanalyst/doc/dev/ccache

doc: dev add a note about ccache

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14886 from badone/wip-async-osd-scrub-sleep
Kefu Chai [Tue, 9 May 2017 12:27:17 +0000 (20:27 +0800)]
Merge pull request #14886 from badone/wip-async-osd-scrub-sleep

osd: Implement asynchronous scrub sleep

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #14985 from johnzzpcrystal/store_errno
Kefu Chai [Tue, 9 May 2017 12:26:24 +0000 (20:26 +0800)]
Merge pull request #14985 from johnzzpcrystal/store_errno

msg/async/net_handler: errno should be stored before calling next function

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoceph-disk: separate ceph-osd --check-needs-* logs 15016/head
Loic Dachary [Tue, 9 May 2017 10:32:51 +0000 (12:32 +0200)]
ceph-disk: separate ceph-osd --check-needs-* logs

It is using the OSD id zero but have nothing to do with OSD zero and
this is confusing to the user. The log themselves do not need to be kept
around and are stored in the run directory so that they can be disposed
of after reboot.

Fixes: http://tracker.ceph.com/issues/19888
Signed-off-by: Loic Dachary <loic@dachary.org>
8 years agobuild/ops: rpm: fix python-Sphinx package name for SUSE 15015/head
Nathan Cutler [Tue, 9 May 2017 09:42:58 +0000 (11:42 +0200)]
build/ops: rpm: fix python-Sphinx package name for SUSE

This commit moves "BuildRequires: python-sphinx" down to the RH/CentOS/Fedora
distro conditional and adds a "BuildRequires: python-Sphinx" to the SUSE
conditional.

Signed-off-by: Jan Matejek <jmatejek@suse.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agoosd/PG.cc: unify the call of checking whether lock is held 15013/head
Jin Cai [Tue, 9 May 2017 09:02:13 +0000 (17:02 +0800)]
osd/PG.cc: unify the call of checking whether lock is held

Signed-off-by: Jin Cai <caijin.caij@alibaba-inc.com>
8 years agodoc: dev add a note about ccache 14478/head
Abhishek Lekshmanan [Wed, 12 Apr 2017 13:08:00 +0000 (15:08 +0200)]
doc: dev add a note about ccache

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
8 years agomds: fix dir auth calculation in CDir::merge
Yan, Zheng [Tue, 9 May 2017 08:28:13 +0000 (16:28 +0800)]
mds: fix dir auth calculation in CDir::merge

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
8 years agomds: properly cleanup export states
Yan, Zheng [Tue, 9 May 2017 08:26:48 +0000 (16:26 +0800)]
mds: properly cleanup export states

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
8 years agocmake: do not link messenger tests against libos
Kefu Chai [Tue, 9 May 2017 04:51:26 +0000 (12:51 +0800)]
cmake: do not link messenger tests against libos

objectstore is not used by these tests.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agobuffer, osd: add missing crc cache miss perf counter 14957/head
Piotr Dałek [Tue, 9 May 2017 07:03:22 +0000 (09:03 +0200)]
buffer, osd: add missing crc cache miss perf counter

This helps tracking if/how effective is the CRC cache in bufferlists.

Signed-off-by: Piotr Dałek <piotr.dalek@corp.ovh.com>
8 years agomds: update export targets even when not active
Patrick Donnelly [Tue, 9 May 2017 02:26:48 +0000 (22:26 -0400)]
mds: update export targets even when not active

Problem caught test_migration_on_shutdown. Migration could not proceed because
export_targets were not being updated.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoMerge pull request #14984 from dmick/wip-osd-dup
Dan Mick [Tue, 9 May 2017 02:48:27 +0000 (19:48 -0700)]
Merge pull request #14984 from dmick/wip-osd-dup

test/osd/osd-dup.sh: lower wb fd throttle limits

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14907 from ukernel/wip-19820 15005/head
Yan, Zheng [Tue, 9 May 2017 02:34:00 +0000 (10:34 +0800)]
Merge pull request #14907 from ukernel/wip-19820

ceph-fuse: use user space permission check by default

8 years agoos/bluestore: reorder _deferred_aio_finish 15004/head
Sage Weil [Tue, 9 May 2017 02:18:25 +0000 (22:18 -0400)]
os/bluestore: reorder _deferred_aio_finish

Remove the OpSequencer from the deferred_queue before
marking the txc's completed.  This prevents a race with
_txc_finish trying to reap the completed sequencer that
is still on the deferred_queue, triggering an assert
in the intrusive list hook dtor.

Fixes: http://tracker.ceph.com/issues/19880
Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocommon: Remove redundant includes 15003/head
Brad Hubbard [Mon, 8 May 2017 23:54:30 +0000 (09:54 +1000)]
common: Remove redundant includes

Fixes: http://tracker.ceph.com/issues/19883 (Partially)
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
8 years agoMerge pull request #14976 from trociny/wip-19871
Jason Dillaman [Mon, 8 May 2017 23:41:40 +0000 (19:41 -0400)]
Merge pull request #14976 from trociny/wip-19871

rbd-nbd: relax size check for newer kernel versions

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14656 from chardan/jfw-wip-halflife_atomic_t-rodan
Jason Dillaman [Mon, 8 May 2017 23:41:02 +0000 (19:41 -0400)]
Merge pull request #14656 from chardan/jfw-wip-halflife_atomic_t-rodan

rbd, librbd: migrate atomic_t to std::atomic

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14925 from fangyuxiangGL/fix_unneccesary_write
Matt Benjamin [Mon, 8 May 2017 19:52:00 +0000 (15:52 -0400)]
Merge pull request #14925 from fangyuxiangGL/fix_unneccesary_write

rgw: don't do unneccesary write if buffer with zero length

8 years agoMerge pull request #14990 from wjin/fix
Sage Weil [Mon, 8 May 2017 16:34:48 +0000 (11:34 -0500)]
Merge pull request #14990 from wjin/fix

osd: clean nonused work queue

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14962 from liewegas/wip-denc-dump
Sage Weil [Mon, 8 May 2017 16:33:31 +0000 (11:33 -0500)]
Merge pull request #14962 from liewegas/wip-denc-dump

include/denc: support ENCODE_DUMP

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoMerge pull request #14995 from SUSE/wip-mgr-rest-exit
Kefu Chai [Mon, 8 May 2017 16:18:55 +0000 (00:18 +0800)]
Merge pull request #14995 from SUSE/wip-mgr-rest-exit

pybind/mgr/rest: completely terminate cherrypy in shutdown

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoinclude/denc: clean up ENCODE_DUMP a bit 14962/head
Sage Weil [Mon, 8 May 2017 15:54:54 +0000 (11:54 -0400)]
include/denc: clean up ENCODE_DUMP a bit

- PATH_MAX for string
- ENCODE_DUMP -> ENCODE_DUMP_PATH
- some comments!

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14999 from ivancich/wip-mod-git-subtree-README
Sage Weil [Mon, 8 May 2017 14:22:38 +0000 (09:22 -0500)]
Merge pull request #14999 from ivancich/wip-mod-git-subtree-README

doc: Re-word the warnings about using git subtrees.

8 years agodoc: Re-word the warnings about using git subtrees. 14999/head
J. Eric Ivancich [Tue, 2 May 2017 20:31:11 +0000 (16:31 -0400)]
doc: Re-word the warnings about using git subtrees.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
8 years agorbd_mirror: migrate std::atomic<unsigned> to std::atomic<bool> 14656/head
Jesse Williamson [Wed, 19 Apr 2017 09:58:35 +0000 (02:58 -0700)]
rbd_mirror: migrate std::atomic<unsigned> to std::atomic<bool>

Signed-off-by: Jesse Williamson <jwilliamson@suse.de>
8 years agolibrbd: migrate atomic_t to std::atomic<>
Jesse Williamson [Sun, 16 Apr 2017 08:31:16 +0000 (01:31 -0700)]
librbd: migrate atomic_t to std::atomic<>

Signed-off-by: Jesse Williamson <jwilliamson@suse.de>
8 years agotools (rbd*): migrate atomic_t to std::atomic<>
Jesse Williamson [Mon, 24 Apr 2017 07:43:23 +0000 (00:43 -0700)]
tools (rbd*): migrate atomic_t to std::atomic<>

Signed-off-by: Jesse Williamson <jwilliamson@suse.de>
8 years agomon/PGMap.cc: fix "osd_epochs" section of dump_basic 14996/head
xie xingguo [Mon, 8 May 2017 13:43:52 +0000 (21:43 +0800)]
mon/PGMap.cc: fix "osd_epochs" section of dump_basic

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agopybind/mgr/rest: completely terminate cherrypy in shutdown 14995/head
Tim Serong [Mon, 8 May 2017 13:03:55 +0000 (23:03 +1000)]
pybind/mgr/rest: completely terminate cherrypy in shutdown

cherrypy.engine.stop() doesn't actually completely kill cherrypy,
which means cherrypy.engine.block() never returns, so this module's
thread never completes cleanly.

Signed-off-by: Tim Serong <tserong@suse.com>
8 years agoMerge pull request #14956 from liewegas/wip-bdev-ioc-lock
Haomai Wang [Mon, 8 May 2017 12:14:31 +0000 (20:14 +0800)]
Merge pull request #14956 from liewegas/wip-bdev-ioc-lock

os/bluestore: fix use after free race with aio_wait

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Jianpeng Ma <jianpeng@intel.com>