RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-17 17:05:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
67,304 Commits 211 Branches 394 Tags 2 GiB
b29faef354
Commit Graph

67304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sage Weil
cf8161f78c Merge pull request #12634 from liewegas/wip-bluestore-shard-keys 
os/bluestore: do not cache shard keys

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: Allen Samuels <allen.samuels@sandisk.com>
 2016-12-23 22:53:08 -06:00
Sage Weil
29b7226a4b Merge pull request #12635 from liewegas/wip-bluestore-cache 
os/bluestore: set cache meta ratio to .9

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
 2016-12-23 22:52:43 -06:00
Sage Weil
0ddbdf8628 Merge pull request #12644 from xiexingguo/xxg-wip-bluestore-keyreserve 
os/bluestore: preallocate object[extent_shard] key to avoid reallocate

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-12-23 22:52:29 -06:00
Haomai Wang
22e0d6cf85 messages/MOSDSubOp: Make encode_payload can be reentrant 
Otherwise, AsyncConnection will use uninitialized feature to encode
message. The caller side will set a old version header but encode with newest
feature since passing feature is ok. It will let receiver side got a old
header version but newest payload decode result.

Signed-off-by: Haomai Wang <haomai@xsky.com>
 2016-12-24 11:33:34 +08:00
Willem Jan Withagen
cb4950b3ae src/test/test_denc.cc: Fix errors in buffer overflow 
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
 2016-12-24 00:46:54 +01:00
Sage Weil
f5f16ce8f9 os/bluestore: do not precalculate/cache shard keys 
Note that we are generating it on demand now.  We can
probably do better, especially when in a loop.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-12-23 15:48:50 -05:00
Sage Weil
a03c5be452 Merge pull request #12149 from adamemerson/wip-g_ceph_context-exterminate 
global: start removing g_ceph_context

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2016-12-23 08:40:48 -06:00
Sage Weil
6251ff6a3e Merge remote-tracking branch 'gh/kraken' 2016-12-23 09:37:23 -05:00
Sage Weil
2861a2188a Merge pull request #12630 from liewegas/wip-workunit-retry 
qa/tasks/workunit: clear clone dir before retrying checkout

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-12-23 08:12:35 -06:00
Sage Weil
8bbdcae9b1 Merge pull request #12614 from liewegas/wip-task-peer 
qa/tasks/peer: update task based on current peering behavior

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-12-23 08:11:36 -06:00
Haomai Wang
9dc43d3b32 Merge pull request #12559 from Adirl/verify_transport_type 
msg/async: assert if compiled code doesn't support the configured ms_…

Reviewed-by: Haomai Wang <haomai@xsky.com>
 2016-12-23 21:38:15 +08:00
Avner BenHanoch
e3b744a19d msg/async: assert if compiled code doesn't support the configured ms_async_transport_type 
for example, currently there is a crash when using the async stack (access of null pointer)
in case the user configured rdma for a code that was not compiled with RDMA

issue: 913397

Change-Id: I4e3d88006312a713b8d3aaefbdcd0596039270e1
Signed-off-by: Avner BenHanoch <avnerb@mellanox.com>
 2016-12-23 13:59:00 +02:00
Igor Fedotov
66deb1f7da Merge pull request #12643 from xiexingguo/xxg-wip-bluestore-1123 
os/bluestore: remove intermediate key var to avoid string copy

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: whu liuchang <liuchang0812@gmail.com>
 2016-12-23 14:52:48 +03:00
Oren Duer
a7f177d1eb msg/async/rdma: fix RoCE v2 deafult value 
For backward compatibility, if no GID given or given GID is malformed,
use GID index 0.

Change-Id: I8c8ecbcfc0261e58c5a226ef6bc91297ec756182
Signed-off-by: Oren Duer <oren@mellanox.com> Adir Lev <adirl@mellanox.com>
Signed-off-by: Adir Lev <adirl@mellanox.com>
 2016-12-23 11:36:10 +00:00
xie xingguo
61bf533bc8 os/bluestore: preallocate object[extent_shard] key to avoid reallocate 
which is less efficient.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-12-23 18:25:47 +08:00
xie xingguo
1e156feb9a os/bluestore: remove intermediate key var to avoid string copy 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-12-23 16:56:33 +08:00
Abhishek Lekshmanan
4753720f29 doc: release notes for v11.1.1 
Signed-off-by: Abhishek Lekshmanan <alekshmanan@suse.com>
 2016-12-23 12:29:51 +05:30
Xie Xingguo
69d57b77bd Merge pull request #12636 from badone/wip-doc-pg-states 
doc: Remove "splitting" state

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-12-23 10:33:53 +08:00
Xie Xingguo
8eb2241240 Merge pull request #12543 from hjwsm1989/cleanup2 
osd/ECBackend: remove unused variable "ReadCB"

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-12-23 08:57:03 +08:00
Brad Hubbard
c51a3afe03 doc: Remove "splitting" state 
There is no splitting state so remove it from pg-states.rst

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
 2016-12-23 09:23:19 +10:00
Yuri Weinstein
779ce4c8c4 Merge pull request #12632 from liewegas/wip-centos-73 
qa/suites: switch from centos 7.2 to 7.x

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
 2016-12-22 15:19:07 -08:00
Sage Weil
926d27fc24 Merge remote-tracking branch 'gh/kraken' 
# Conflicts:
#	src/os/bluestore/BlueStore.cc
 2016-12-22 18:16:49 -05:00
Sage Weil
04dea97100 os/bluestore: set cache meta ratio to .9 
More metadata, less data.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-12-22 17:47:18 -05:00
Sage Weil
004ef2c648 qa/distros: centos_7.yaml -> centos.yaml 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-12-22 17:19:42 -05:00
Sage Weil
948f97b3bd msg/simple: clear_pipe when wait() is mopping up pipes 
When wait is mopping up connections it may hit one that
is in the process of accepting.  It will unregister it
whilst the accept() thread is trying to set it up,
aborting the accept and getting it reaped.  However,
the pipe mop-up does not clear_pipe() the way that
mark_down(), mark_down_all(), and fault() do, which
leads to this assert.

Pipe is accepting...

  -161> 2016-12-22 17:31:45.460613 37353700 10 -- 172.21.15.14:6804/20738 >> 172.21.15.35:0/146098963 pipe(0x3e2a5c20 sd=31 :6804 s=0 pgs=0 cs=0 l=1 c=0x3e2a6f40).accept:  setting up session_security.
  -160> 2016-12-22 17:31:45.460733 37353700 10 -- 172.21.15.14:6804/20738 >> 172.21.15.35:0/146098963 pipe(0x3e2a5c20 sd=31 :6804 s=0 pgs=0 cs=0 l=1 c=0x3e2a6f40).accept new session
  -159> 2016-12-22 17:31:45.460846 37353700 10 -- 172.21.15.14:6804/20738 >> 172.21.15.35:0/146098963 pipe(0x3e2a5c20 sd=31 :6804 s=2 pgs=7 cs=1 l=1 c=0x3e2a6f40).accept success, connect_seq = 1, sending READY
  -158> 2016-12-22 17:31:45.460959 37353700 10 -- 172.21.15.14:6804/20738 >> 172.21.15.35:0/146098963 pipe(0x3e2a5c20 sd=31 :6804 s=2 pgs=7 cs=1 l=1 c=0x3e2a6f40).accept features 1152921504336314367

wait() is shutting down...

  -156> 2016-12-22 17:31:45.461882 9506ac0 20 -- 172.21.15.14:6804/20738 wait: stopping accepter thread
  -155> 2016-12-22 17:31:45.462994 9506ac0 10 accepter.stop accept listening on: 15
...
  -116> 2016-12-22 17:31:45.482137 9506ac0 10 -- 172.21.15.14:6804/20738 wait: closing pipes
  -115> 2016-12-22 17:31:45.482850 9506ac0 10 -- 172.21.15.14:6804/20738 >> 172.21.15.35:0/146098963 pipe(0x3e2a5c20 sd=31 :6804 s=2 pgs=7 cs=1 l=1 c=0x3e2a6f40).unregister_pipe
  -114> 2016-12-22 17:31:45.483421 9506ac0 10 -- 172.21.15.14:6804/20738 >> 172.21.15.35:0/146098963 pipe(0x3e2a5c20 sd=31 :6804 s=2 pgs=7 cs=1 l=1 c=0x3e2a6f40).stop

...which interrupts the accept()...

  -113> 2016-12-22 17:31:45.484164 37353700 10 -- 172.21.15.14:6804/20738 >> 172.21.15.35:0/146098963 pipe(0x3e2a5c20 sd=31 :6804 s=4 pgs=7 cs=1 l=1 c=0x3e2a6f40).accept fault after register

and makes accept() return failure, and reader() to exit
and reap...

  -110> 2016-12-22 17:31:45.486103 9506ac0 10 -- 172.21.15.14:6804/20738 wait: waiting for pipes 0x3e2a5c20 to close
  -109> 2016-12-22 17:31:45.487146 37353700 10 -- 172.21.15.14:6804/20738 queue_reap 0x3e2a5c20
  -108> 2016-12-22 17:31:45.487658 9506ac0 10 -- 172.21.15.14:6804/20738 reaper
  -107> 2016-12-22 17:31:45.487722 9506ac0 10 -- 172.21.15.14:6804/20738 reaper reaping pipe 0x3e2a5c20 172.21.15.35:0/146098963
  -106> 2016-12-22 17:31:45.487816 9506ac0 10 -- 172.21.15.14:6804/20738 >> 172.21.15.35:0/146098963 pipe(0x3e2a5c20 sd=31 :6804 s=4 pgs=7 cs=1 l=1 c=0x3e2a6f40).discard_queue
  -105> 2016-12-22 17:31:45.494742 37353700 10 -- 172.21.15.14:6804/20738 >> 172.21.15.35:0/146098963 pipe(0x3e2a5c20 sd=31 :6804 s=4 pgs=7 cs=1 l=1 c=0x3e2a6f40).reader done
...
   -92> 2016-12-22 17:31:45.527589 9506ac0 -1 /mnt/jenkins/workspace/ceph-dev-new-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos7/DIST/centos7/MACHINE_SIZE/huge/release/11.1.0-6151-ge1781dd/rpm/el7/BUILD/ceph-11.1.0-6151-ge1781dd/src/msg/simple/SimpleMessenger.cc: In function 'void SimpleMessenger::reaper()' thread 9506ac0 time 2016-12-22 17:31:45.488264
/mnt/jenkins/workspace/ceph-dev-new-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos7/DIST/centos7/MACHINE_SIZE/huge/release/11.1.0-6151-ge1781dd/rpm/el7/BUILD/ceph-11.1.0-6151-ge1781dd/src/msg/simple/SimpleMessenger.cc: 235: FAILED assert(!cleared)

Fixes: http://tracker.ceph.com/issues/15784
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-12-22 17:18:11 -05:00
Sage Weil
e9f119bda7 qa/suites: centos_7.2.yaml -> centos_7.yaml 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-12-22 15:41:25 -05:00
Sage Weil
c168ce92aa qa/distros: add centos 7.3 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-12-22 15:39:41 -05:00
Sage Weil
6e7db2329b qa/distros: add centos 7 yaml; use that instead 
No need to be picky about the point release here.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-12-22 15:39:35 -05:00
Adam C. Emerson
4e95986f20 msg: Remove mention of g_ceph_context 
Since it won't exist any more there's no point in saying it can't be
relied on, now is there?

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2016-12-22 14:24:39 -05:00
Adam C. Emerson
f971d6489d objclass: Utterly destroy g_ceph_context 
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2016-12-22 14:24:39 -05:00
Adam C. Emerson
921d6e050e os: Complete removal of g_ceph_context and g_conf 
And so it continues.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2016-12-22 14:24:39 -05:00
Adam C. Emerson
ec815bb934 os: Continuing the removal of g_ceph_context and g_conf 
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2016-12-22 14:24:39 -05:00
Adam C. Emerson
120debe522 os/filestore: Destroy g_ceph_context and g_conf 
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2016-12-22 14:24:39 -05:00
Adam C. Emerson
113686cb70 os/bluestore: Remove g_ceph_context and g_conf 
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2016-12-22 14:24:39 -05:00
Adam C. Emerson
f002a2fc96 os: Add CephContext to ObjectStore and ObjectMap bases 
Preparatory to removing g_ceph_context and g_conf uses

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2016-12-22 13:55:37 -05:00
Adam C. Emerson
1d5e967a05 osd: Remove g_conf and g_ceph_context 
So begins the ruthless annihilation of g_ceph_context.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2016-12-22 13:55:37 -05:00
Adam C. Emerson
b9182564c7 dout: Use dout_context 
As a transition for g_ceph_context removal, make all dout macros depends
on a local macro.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2016-12-22 13:55:37 -05:00
Adam C. Emerson
0863f5415e common: Remove now unused clock_offset option 
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2016-12-22 13:55:37 -05:00
Adam C. Emerson
750ad8340c common: Unskew clock 
In preparation to deglobalizing CephContext, remove the CephContext*
parameter to ceph_clock_now() and ceph::real_clock::now() that carries
a configurable offset.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2016-12-22 13:55:37 -05:00
Sage Weil
ba5b81e4a9 Merge pull request #12629 from liewegas/wip-bluestore-shard-extents 
os/bluestore: remove 'extents' from shard_info

Reviewed-by: Somnath Roy <somnath.roy@sandisk.com>
 2016-12-22 12:50:32 -06:00
Matt Benjamin
566ad2d8b5 Merge pull request #12616 from atheism/rgw-ldap-fix-simple-bind 
rgw: ldap: simple_bind() should set ldap version option on tldap
 2016-12-22 13:49:04 -05:00
Sage Weil
2a7013cd5a qa/tasks/workunit: clear clone dir before retrying checkout 
If we checkout ceph-ci.git, and don't find a branch,
we'll try again from ceph.git. But the checkout will
already exist and the clone will fail, so we'll still
fail to find the branch.

The same can happen if a previous workunit task already
checked out the repo.

Fix by removing the repo before checkout (the first and
second times).  Note that this may break if there are
multiple workunit tasks running in parallel on the same
role.  That is already racy, so if it's happening, we'll
want to switch to using a truly unique clonedir for each
instantiation.

Fixes: http://tracker.ceph.com/issues/18336
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-12-22 13:05:22 -05:00
Nathan Cutler
a185bd4173 doc: mention rbdmap in RBD quick start 
Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2016-12-22 17:17:37 +01:00
Nathan Cutler
fbac4a0815 doc: add verbiage to rbdmap manpage 
Fixes: http://tracker.ceph.com/issues/18262
Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2016-12-22 17:17:35 +01:00
Sage Weil
05a10d84ec os/bluestore: remove 'extents' from shard_info 
We don't use this field; no need to consume the space
on disk.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-12-22 11:03:51 -05:00
Sage Weil
fcbabddfe4 Merge pull request #12394 from ifed01/wip-bluestore-fix-reshard 
os/bluestore: refactor ExtentMap::update to avoid preceeding db updat…

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-12-22 09:25:05 -06:00
Sage Weil
7a157524b7 Merge pull request #12464 from ifed01/wip-bluestore-turnoff-block-write 
os/bluestore: add a debug option to bypass block device writes for bl…

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-12-22 09:24:42 -06:00
Sage Weil
6c889cf8da Merge pull request #12526 from hjwsm1989/ec-cleanup 
osd/ECBackend: only need check missing_loc when doing recovery

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-12-22 09:24:31 -06:00
Sage Weil
5308718101 Merge pull request #12527 from hjwsm1989/cleanup 
osd/PrimaryLogPG: unify the access to primary pg

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-12-22 09:24:01 -06:00
Sage Weil
f75d653316 Merge pull request #12564 from kylinstorage/wip-cleanup-pg-stat-t 
osd/ECBackend: cleanup for unnecessary copy with pg_stat_t

Reviewed-by: Samuel Just <sjust@redhat.com>
 2016-12-22 09:23:10 -06:00