RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-28 14:34:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,994 Commits 211 Branches 0 Tags 1.4 GiB
f00ea3f898
Commit Graph

51994 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sage Weil
dac9ad338d Merge pull request #7693 from aclamk/auto_complete_python 
ceph: bash auto complete for CLI based on mon command descriptions

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-04-03 18:12:03 -04:00
Sage Weil
773d5ec167 Merge pull request #8366 from yangdongsheng/trival 
build: fix compiling warnings

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-04-03 18:11:18 -04:00
Sage Weil
370e4f773a Merge remote-tracking branch 'gh/jewel' 2016-04-03 14:28:23 -04:00
Jason Dillaman
ff9843bb34 Striper: reduce assemble_result log level 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-04-03 10:52:10 -04:00
Jason Dillaman
f812199f72 qa/workunits/rbd: qemu tests need to wait for image to be created 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-04-03 10:29:38 -04:00
Sage Weil
f7137661a2 ceph_test_rados_api_tier: parse env 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-04-03 09:49:07 -04:00
Sage Weil
769c0affc4 ceph_test_rados_api_list: parse env 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-04-03 09:45:56 -04:00
Sage Weil
b9b07c13e4 osd/ReplicatedPG: tolerate pgls commands with full hash 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-04-03 09:45:56 -04:00
Sage Weil
5c612e82bb osd/ReplicatedPG: discard pgnls op that is outside pg bounds 
This should only happen with a buggy client, but we should avoid crashing,
and send a polite error message back.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-04-03 09:45:56 -04:00
Sage Weil
f16187f68d osdc/Objecter: use full hash value for pg[n]ls ops 
Normal ops do this so they can behave when racing with split; pgnls ops
are no different.

In particular, this fixes a bug where we have an old OSDMap that doesn't
reflect a split, and the OSD replies with a 'next' value of the PG's new
max.  If we resend the same value to that PG, it'll be out of bounds,
and BlueStore will notice.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-04-03 09:45:56 -04:00
Sage Weil
9196a75459 osd/ReplicatedPG: fix typo 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-04-03 09:45:56 -04:00
Sage Weil
bf38318070 Merge pull request #8380 from dillaman/wip-cls-fadvise 
cls_rbd: pass WILLNEED fadvise flags during object map update

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-03 09:13:31 -04:00
Wei Jin
a92fa830bd osdmap: rm nonused variable 
Signed-off-by: Wei Jin <wjin.cn@gmail.com>
 2016-04-03 14:20:16 +08:00
Haomai Wang
4eb8f7753c CMake: For CMake version <= 2.8.11, use LINK_PRIVATE 
Signed-off-by: Haomai Wang <haomai@xsky.com>
 2016-04-03 13:31:07 +08:00
Kefu Chai
c432691a3b os/ObjectStore: add noexcept to ensure move ctor is used 
otherwise vector::push_back() will use the copy ctor if it resizes,
to enforce its strong exception guarantee.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-04-03 03:37:13 +08:00
Josh Durgin
fdef226cc9 Merge branch 'wip-cycles' 
common/Cycles: Do not initialize Cycles globally

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
 2016-04-02 12:35:43 -07:00
Richard W.M. Jones
1c2831a2c1 common/Cycles: Do not initialize Cycles globally. 
Move initialization to the few tests that actually use it.

Fixes: http://tracker.ceph.com/issues/15225
Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
 2016-04-02 12:34:10 -07:00
John Coyle
ec79b64f85 unittest_erasure_code_plugin: fix deadlock caused by locked mutex in cancelled thread 
Added unlock when thread is cancelled.

Signed-off-by: John Coyle <dx9err@gmail.com>
 2016-04-02 00:10:12 -04:00
Sage Weil
9470969da1 Merge pull request #8193 from liewegas/wip-bluestore 
os/bluestore: a few fixes
 2016-04-01 17:52:47 -04:00
David Zafman
aedc529b4c test: Fix test to run with btrfs which has snap_### dirs 
Fixes: http://tracker.ceph.com/issues/15347

Signed-off-by: David Zafman <dzafman@redhat.com>
 2016-04-01 14:35:50 -07:00
Orit Wasserman
f53cb1289a Merge pull request #8404 from cbodley/wip-rgw-realm-pull-fix 
radosgw-admin: fix for 'realm pull'
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 2016-04-01 20:22:51 +02:00
Josh Durgin
b71cc17f1c Merge pull request #8417 from dillaman/wip-librbd-mirroring-unsupported 
librbd: avoid throwing error if mirroring is unsupported

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-04-01 10:54:02 -07:00
Josh Durgin
c9ca7692e4 Merge pull request #8325 from trociny/wip-rbd-mirror-test-misc 
test: rbd-mirror: script improvements for manual testing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-04-01 09:55:20 -07:00
Jason Dillaman
d21646ade6 Merge pull request #8413 from runsisi/wip-fix-eexist 
cls_journal: fix -EEXIST checking

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-04-01 11:16:12 -05:00
Jason Dillaman
3dd5249b6a librbd: avoid throwing error if mirroring is unsupported 
Attempting to remove an image will remove the image from the mirroring
directory.  However, if the OSD is older and doesn't support this
new feature, avoid throwing an error.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-04-01 12:08:12 -04:00
Casey Bodley
280b8a1b85 rgw: add exclusive flag to set_as_default() 
this dodges the race in RGWRealm::create() and RGWZoneParams::create()
that decides whether to set the new object as a default. by calling
set_as_default() with exclusive=true, it will fail with EEXIST if a
default is already set

it also fixes an issue with 'realm pull' on a secondary zone, where a
'default' zone may be created but never actually set_as_default()

Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-04-01 12:01:24 -04:00
Casey Bodley
7567b45fc0 rgw: add exclusive flag to RGWRealm::create_control 
this was causing failures in 'radosgw-admin realm pull':

  ERROR creating control for new realm realm0: (17) File exists

'realm pull' calls RGWRealm::create() with exclusive=false, but
RGWRealm::create_control() was using exclusive=true

Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-04-01 12:01:24 -04:00
Abhishek Lekshmanan
27e4c46f74 rgw_admin: improve the orphans find help 
Adding  a few missing commandline switches and improve the help message

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2016-04-01 16:47:46 +02:00
Kefu Chai
dbdbacfc13 Merge pull request #8406 from dmick/jewel 
debian/rules: put init-ceph in /etc/init.d/ceph, not ceph-base

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-04-01 22:26:26 +08:00
Kefu Chai
1f3aad6b10 Merge pull request #8324 from tchaikov/wip-mon-cleanup 
mon: remove remove_legacy_versions()

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
 2016-04-01 22:19:46 +08:00
Abhishek Lekshmanan
c4efef5790 rgw: add a few missing cmdline switches in help 
Add a few missing commandlien switches for zone
operations (zone_id,source_zone,read_only) to the help options

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2016-04-01 15:41:41 +02:00
runsisi
09b53567b8 cls_journal: fix -EEXIST checking 
Signed-off-by: runsisi <runsisi@zte.com.cn>
 2016-04-01 20:56:26 +08:00
Abhishek Lekshmanan
2c0f03a9fe rgw_admin: remove unused parent_period arg 
This variable seems to be unused, removing from help and code

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2016-04-01 14:41:58 +02:00
Dan Mick
a29b96ad3a debian/rules: put init-ceph in /etc/init.d/ceph, not ceph-base 
When the package name changed from ceph to ceph-base, dh_installinit
started installing the init script into /etc/init.d/ceph-base.  Fix
this by using --name ceph with dh_installinit, which requires
1) naming the .init file ceph-base.ceph.init, and
2) calling dh_installinit separately for each package

Fixes: http://tracker.ceph.com/issues/15329
Signed-off-by: Dan Mick <dan.mick@redhat.com>
 2016-03-31 21:13:13 -07:00
Jason Dillaman
550761b5f6 Merge pull request #8371 from runsisi/wip-fix-eexist 
cls_rbd: fix -EEXIST checking in cls::rbd::image_set

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-31 13:34:26 -05:00
Ira Cooper
602425abd5 configure: Add -D_LARGEFILE64_SOURCE to Linux build. 
Without -D_LARGEFILE64_SOURCE we can't build against libxfs,
because off64_t must be defined.

Signed-off-by: Ira Cooper <ira@redhat.com>
 2016-03-31 12:30:45 -04:00
Sage Weil
e925c67cc3 Merge pull request #8400 from qhjindev/fix_mon 
mon: remove unnecessary comment for update_from_paxos
 2016-03-31 11:21:50 -04:00
Casey Bodley
1302143813 Merge pull request #8399 from oritwas/wip-cmake-mirrorwatcher 
cmake: add missing librbd/MirrorWatcher.cc and librd/ObjectWatcher.cc
 2016-03-31 11:05:14 -04:00
Qinghua Jin
639f158db2 mon: remove unnecessary comment for update_from_paxos 
The return value comment for update_from_paxos is unnecessary.

Signed-off-by: Qinghua Jin <qhjin_dev@163.com>
 2016-03-31 22:37:12 +08:00
Orit Wasserman
f5ef4d44e0 cmake: add missing librbd/MirrorWatcher.cc and librd/ObjectWatcher.cc 
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
 2016-03-31 16:00:06 +02:00
Orit Wasserman
825a5ddcd4 Merge pull request #8394 from xiexingguo/xxg-wip-compile 
rgw: fix compiling error
 2016-03-31 15:57:55 +02:00
Loic Dachary
aab32bddb3 Merge pull request #8358 from dachary/wip-releases 
releases: what is merged where and when ?

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.cz>
Reviewed-by: Sage Weil <sage@redhat.com>
 2016-03-31 15:16:29 +02:00
Loic Dachary
919ff4ff29 releases: what is merged where and when ? 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2016-03-31 15:10:40 +02:00
Loic Dachary
9f60e07267 releases: update understanding the release cycle 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2016-03-31 15:01:09 +02:00
Loic Dachary
c1c71ecf23 release-notes: v10.0.5 release notes 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2016-03-31 15:01:09 +02:00
Orit Wasserman
7df7c2a07d Merge pull request #7875 from badone/wip-coverity-rgw_file-unused 
[rgw] Check return code in RGWFileHandle::write

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 2016-03-31 14:52:02 +02:00
xie xingguo
535eb0e608 rgw: fix compiling error 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-03-31 19:48:38 +08:00
Orit Wasserman
938c45e3fa Merge pull request #8200 from H3C/wip-rgw-bugfixb 
rgw/rgw_admin:fix bug about list and stats command
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 2016-03-31 13:43:49 +02:00
Mykola Golub
4e1e81a2a7 qa/workunits/rbd: use cluster1/2 instead local/remote as cluster names 
After adding tests that start daemons in both clusters, local/remote
names look confusing.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-03-31 14:17:58 +03:00
Mykola Golub
2226019037 qa/workunits/rbd: add helper to determine rbd-mirror local cluster 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-03-31 14:16:21 +03:00