RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-23 20:03:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
72,226 Commits 211 Branches 394 Tags 1.2 GiB
6b86362036
Commit Graph

72226 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Dillaman
6b86362036 Merge pull request #15048 from trociny/wip-19907 
rbd-mirror: resolve admin socket path names collision

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2017-05-15 08:43:55 -04:00
John Spray
17f669a868 Merge pull request #15026 from ukernel/wip-19891 
qa/suites/fs: reserve more space for mds in full tests

Reviewed-by: John Spray <john.spray@redhat.com>
 2017-05-15 13:21:52 +01:00
John Spray
a1e51dfc90 Merge pull request #15039 from ukernel/wip-19903 
client: fix UserPerm::gid_in_group()

Reviewed-by: John Spray <john.spray@redhat.com>
 2017-05-15 13:18:09 +01:00
John Spray
897b5f5bbe Merge pull request #15035 from batrick/quiet-mds-grow-shrink 
qa: silence spurious insufficient standby health warnings

Reviewed-by: Yan, Zheng <zyan@redhat.com>
 2017-05-15 13:17:38 +01:00
John Spray
d63962f194 Merge pull request #14991 from ukernel/wip-19828 
mds: fix use-after-free in Locker::file_update_finish()

Reviewed-by: John Spray <john.spray@redhat.com>
 2017-05-15 13:16:35 +01:00
John Spray
0f250a889d Merge pull request #14978 from cernceph/dvanders_quota 
client: client_quota no longer optional

Reviewed-by: John Spray <john.spray@redhat.com>
 2017-05-15 13:16:09 +01:00
Kefu Chai
43a55828c6 Merge pull request #15044 from lixiaoy1/master 
test/fio_ceph_objectstore: fix fio plugin build failure by engine_data

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-05-15 16:10:09 +08:00
Sage Weil
3e138f88dc Merge pull request #15076 from atheism/atheism-mailmap 
mailmap: Weibing Zhang mailmap affiliation
 2017-05-14 22:06:47 -05:00
Sage Weil
ade9fec92b Merge pull request #15007 from ztczll/master 
test/objectstore/: Check put_ref return value

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
 2017-05-14 21:50:37 -05:00
Sage Weil
a869c9a56a Merge pull request #15021 from runsisi/wip-fix-writefull 
osd/PrimayLogPG: update modified range to include the whole object size for write_full op

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-05-14 21:50:09 -05:00
Sage Weil
d53127a27f Merge pull request #15046 from ukernel/wip-osdmap-encode 
osd/OSDMap: bump encoding version for require_min_compat_client

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-05-14 21:49:21 -05:00
Weibing Zhang
1624b063c5 mailmap: Weibing Zhang mailmap affiliation 
Signed-off-by: Weibing Zhang <atheism.zhang@gmail.com>
 2017-05-14 13:12:58 +08:00
Mykola Golub
cd71ffce19 rbd-mirror: resolve admin socket path names collision 
If global admin_socket parameter is set, for PoolReplayer admin
sockets generate and use unique paths in $run_dir. Provide the socket
paths in output of PoolReplayer's "rbd mirror status" admin socket
command.

A possible use case:

1) run "rbd mirror status $pool_replayer" command using global admin
   socket (known from configuration) and obtain socket paths for the
   PoolReplayer local and remote context sockets.
2) Use these paths to run commands provides by the contexts.

Fixes: http://tracker.ceph.com/issues/19907
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2017-05-12 20:28:16 +02:00
Yehuda Sadeh
404cee744f Merge pull request #13111 from cbodley/wip-rgw-mdlog-trim 
rgw multisite: automated mdlog trimming

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2017-05-12 07:12:17 -07:00
Kefu Chai
cf8b54ae7d Merge pull request #15004 from liewegas/wip-19880 
os/bluestore: fix deferred write race

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
 2017-05-12 19:45:01 +08:00
Kefu Chai
c8262225de 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>
 2017-05-12 19:40:59 +08:00
Kefu Chai
6fbcac46a3 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>
 2017-05-12 19:40:02 +08:00
Kefu Chai
5a32cd3d3c Merge pull request #15019 from badone/wip-redundant-headers-2 
common: Remove redundant includes

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-05-12 19:38:28 +08:00
Kefu Chai
e08283a970 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>
 2017-05-12 19:36:02 +08:00
Kefu Chai
a4d4a9bcc9 Merge pull request #15009 from tchaikov/wip-kill-warnings 
libradosstriper: do not assign garbage to returned value

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
 2017-05-12 19:34:13 +08:00
Kefu Chai
05e2528b92 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>
 2017-05-12 19:06:09 +08:00
zhanglei
fc9fa8acb8 test/common: Check block_device_model return value 
Signed-off-by: zhanglei <243290414@qq.com>
 2017-05-12 04:59:33 -04:00
Sage Weil
d0a73ec955 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>
 2017-05-11 21:18:11 -05:00
Sage Weil
bc6e9a304c Merge pull request #15056 from liewegas/wip-fix-osdmap-comment 
osd/OSDMap: fix feature commit comment
 2017-05-11 17:30:27 -05:00
Sage Weil
44ad0acf78 osd/OSDMap: fix feature commit comment 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-05-11 17:29:26 -05:00
Casey Bodley
74ddaa5eae 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>
 2017-05-11 12:01:26 -04:00
Casey Bodley
6e8d337151 Merge pull request #14411 from mikulely/rgw-cleanup-rados 
rgw: rgw_rados drop deprecated global var

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2017-05-11 11:59:23 -04:00
Casey Bodley
9fbea01c96 Merge pull request #14906 from mikulely/lc-cleanup-2 
rgw: cleanup lc continuation

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
 2017-05-11 11:58:38 -04:00
Casey Bodley
84fb0cd505 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>
 2017-05-11 11:56:02 -04:00
Sage Weil
381f465839 Merge pull request #15017 from dillaman/wip-19863 
common/bit_vector: utilize deep-copy during data decode

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-05-11 10:17:15 -05:00
lisali
2c91e91b8a test/fio_ceph_objectstore: fix fio plugin build failure by engine_data 
The commit in fio 710bf9c592
changed engine_data to a union which leads build of fio_ceph_objectstore failed.

Signed-off-by: Lisa Li xiaoyan.li@intel.com
 2017-05-11 10:44:43 -04:00
runsisi
1fdc92716e osd/PrimayLogPG: update modified range to include the whole object size for write_full op 
Signed-off-by: runsisi <runsisi@zte.com.cn>
 2017-05-11 21:54:30 +08:00
runsisi
bb6d2de31a osd/PrimaryLogPG: drop parameter count_bytes for write_update_size_and_usage 
Signed-off-by: runsisi <runsisi@zte.com.cn>
 2017-05-11 21:45:08 +08:00
Yan, Zheng
4a09e9431d osd/OSDMap: bump encoding version for require_min_compat_client 
Otherwise, OSDMap::decode() throws expcetion when decoding old
version osdmap

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
 2017-05-11 21:37:50 +08:00
John Spray
745902aec6 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>
 2017-05-11 10:46:41 +01:00
John Spray
1b1fc05506 Merge pull request #14704 from batrick/i19589 
mds: fix mantle script to not fail for last rank

Reviewed-by: Michael Sevilla <mikesevilla3@gmail.com>
 2017-05-11 10:12:22 +01:00
Yan, Zheng
9f751d6e21 mds: fix use-after-free in Locker::file_update_finish() 
The capability may have already been freed when executing
Locker::file_update_finish()

Fixes: http://tracker.ceph.com/issues/19828
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
 2017-05-11 14:14:47 +08:00
Yan, Zheng
80b7672bf8 Merge pull request #14921 from batrick/ptrwaiter-balance 
mds: relocate PTRWAITER put near get
 2017-05-11 14:10:12 +08:00
Kefu Chai
f3c44a0dfc 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>
 2017-05-11 13:16:31 +08:00
Yan, Zheng
b67a599ebe Merge pull request #14598 from batrick/mds-balancer-pin 
mds: support export pinning on directories
 2017-05-11 11:56:34 +08:00
Yan, Zheng
3977c30337 client: fix UserPerm::gid_in_group() 
Fixes: http://tracker.ceph.com/issues/19903
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
 2017-05-11 11:42:26 +08:00
Yan, Zheng
bbb3369b50 qa/suites/fs: fix write size calculation in full tests 
'max_avail' has already taken full_ratio into account

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
 2017-05-11 11:18:22 +08:00
Brad Hubbard
2f3cd60855 common: Remove redundant includes 
Fixes: http://tracker.ceph.com/issues/19883 (Partially)

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
 2017-05-11 11:59:08 +10:00
Patrick Donnelly
b6ba30ba57
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>
 2017-05-10 17:35:44 -04:00
Kefu Chai
5e3f837222 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>
 2017-05-10 23:12:30 +08:00
Kefu Chai
b7a194eb65 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>
 2017-05-10 23:12:30 +08:00
Kefu Chai
c44cdc27d5 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>
 2017-05-10 23:12:30 +08:00
Kefu Chai
ba2a94c1dc byteorder: remove the cruft to detect endianness 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-05-10 23:12:30 +08:00
Kefu Chai
833705e885 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>
 2017-05-10 23:12:30 +08:00
Kefu Chai
e0347b39fb cmake: use cmake module to detect endianness 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-05-10 23:11:13 +08:00