Commit Graph

52023 Commits

Author SHA1 Message Date
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
John Spray
d034539c52 qa: update rest test cephfs calls (part 2)
"mds stat" now gives fsmap output rather than
mdsmap.  Update the rest api test's expectations.

Fixes: http://tracker.ceph.com/issues/15309
Signed-off-by: John Spray <john.spray@redhat.com>
2016-03-31 11:28:43 +01:00
Loic Dachary
e5505523a1 Merge pull request #8373 from wjwithagen/patch-4
ceph-detect-init/run-tox.sh: FreeBSD: No init detect

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-03-31 12:21:56 +02:00
Orit Wasserman
b9321d01b5 Merge pull request #8387 from dreamhost/wip-mp-listpartresult-etag
rgw: Multipart ListPartsResult ETag quotes

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-03-31 11:55:13 +02:00
Mykola Golub
70b1303a08 qa/workunits/rbd: improvements for manual testing
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-03-31 11:42:13 +03:00
Adam Kupczyk
81a55d3b3b bash_completion: now bash completion uses improved "ceph --completion"
Signed-off-by: Adam Kupczyk <a.kupczyk@mirantis.com>
2016-03-31 10:37:16 +02:00
Adam Kupczyk
a891d94e76 tools: Auto complete feature for CLI.
Now logic moved from bash to python.
Not bind to bash yet. Use as 'ceph --comp osd ls'.
Able to fulfill commands and print command line help.
Signed-off-by: Adam Kupczyk <a.kupczyk@mirantis.com>
2016-03-31 09:56:12 +02:00
Robin H. Johnson
a58b774e72 rgw: Multipart ListPartsResult ETag quotes
ListPartsResult output has always missed quotes on the ETag since it was
first committed.

Fixes: #15334
Backports: hammer, infernalis
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
2016-03-31 06:25:58 +00:00
Sage Weil
d6569bfe58 Merge pull request #8372 from jcsp/wip-15309
qa: update rest test cephfs calls
2016-03-31 01:15:38 -04:00
Sage Weil
b5f8cac89d Merge pull request #8258 from asheplyakov/bug-12065
monclient: avoid key renew storm on clock skew

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-31 01:14:22 -04:00
Sage Weil
9f3e9efdde Merge pull request #8348 from xiexingguo/xxg-wip-failurepending
osd: fix failure report handling during ms_handle_connect()

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-31 01:13:58 -04:00
Sage Weil
6736341fcd Merge pull request #8369 from xiexingguo/xxg-wip-tick
osd: fix tick relevant issues

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-31 01:08:01 -04:00
Sage Weil
0c1f041bec Merge pull request #8354 from tchaikov/wip-missing-cls
osd/ClassHandler: only dlclose() the classes not missing

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-31 01:07:17 -04:00
Dongsheng Yang
f6be50d99a os/filestore: fix a -Wunused-label warning in compiling.
os/filestore/FileStore.cc: In member function ‘int FileStore::_zero(const coll_t&, const ghobject_t&, uint64_t, size_t)’:
os/filestore/FileStore.cc:3328:2: warning: label ‘out’ defined but not used [-Wunused-label]
  out:
  ^

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-03-31 00:08:21 -04:00
Dongsheng Yang
c97ce4fc16 test/objectstore: fix a -Wsign-compare warning in compiling.
In file included from test/objectstore/store_test.cc:33:0:
../src/gmock/gtest/include/gtest/gtest.h: In instantiation of ‘testing::AssertionResult testing::internal::CmpHelperEQ(const char*, const char*, const T1&, const T2&) [with T1 = unsigned int; T2 = int]’:
../src/gmock/gtest/include/gtest/gtest.h:1524:23:   required from ‘static testing::AssertionResult testing::internal::EqHelper<true>::Compare(const char*, const char*, const T1&, const T2&, typename testing::internal::EnableIf<(! testing::internal::is_pointer<T2>::value)>::type*) [with T1 = unsigned int; T2 = int; typename testing::internal::EnableIf<(! testing::internal::is_pointer<T2>::value)>::type = void]’
test/objectstore/store_test.cc:1088:285:   required from here
../src/gmock/gtest/include/gtest/gtest.h:1448:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
   if (expected == actual) {
                ^

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-03-31 00:08:21 -04:00
Dongsheng Yang
565ab25fdb test/system: fix a -Wsign-compare warning in compiling.
test/system/st_rados_create_pool.cc: In function ‘std::__cxx11::string get_temp_pool_name(const char*)’:
test/system/st_rados_create_pool.cc:128:9: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
   assert(ret < sizeof(poolname));
         ^

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-03-31 00:08:20 -04:00
Josh Durgin
4030ee6e75 Merge pull request #8355 from dillaman/wip-15029
librbd: send notifications for mirroring status updates

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-30 18:46:11 -07:00
runsisi
1f8f43daed cls_rbd: fix -EEXIST checking in cls::rbd::image_set
Signed-off-by: runsisi <runsisi@hust.edu.cn>
2016-03-31 09:24:41 +08:00
Jason Dillaman
77391b394e librados_test_stub: add new cls_cxx_read2/write2 methods
Fixes: http://tracker.ceph.com/issues/15332
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-30 18:44:07 -04:00
Jason Dillaman
231edd7547 cls_rbd: pass WILLNEED fadvise flag for object map update ops
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-30 18:38:09 -04:00
Jason Dillaman
0510301845 objclass: add cls_cxx_read2/cls_cxx_write2
These new methods support passing op flags (e.g. cache hints).

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-30 18:38:09 -04:00
Sage Weil
d994c111a1 Merge pull request #8382 from athanatos/wip-15241
osd: fix epoch check in handle_pg_create

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-30 18:36:42 -04:00
Samuel Just
7e58045f0e OSD::handle_pg_create: check same_primary_since
Rather than add a flag to handle_pg_peering_evt, check
same_primary_since here and pass the create event to
handle_pg_peering_evt as if it originated at the current epoch (the
project_pg_history checks in handle_pg_peering_evt will be noops).

Fixes: tracker.ceph.com/issues/15241
Signed-off-by: Samuel Just <sjust@redhat.com>
2016-03-30 15:34:31 -07:00
Samuel Just
6b82bc5b65 Merge pull request #8147 from xiaoxichen/fix-get-map
osd/OSD.cc: finish full_map_request every MOSDMap message.

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-30 15:25:36 -07:00