Commit Graph

53865 Commits

Author SHA1 Message Date
Yan, Zheng
8f09dd15cb MDSMonitor.cc: fix mdsmap.<namespace> subscriptions
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2016-05-25 20:14:07 +08:00
Orit Wasserman
b70151129b Merge pull request #9122 from cbodley/wip-rgw-httpmgr-pipe
rgw: clean up pipe fds in RGWHTTPManager::stop()
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-05-25 14:05:11 +02:00
Orit Wasserman
9e74d051df Merge pull request #8765 from cbodley/wip-rgw-usr2
rgw: extend SIGHUP handler for realm reconfiguration
2016-05-25 14:03:36 +02:00
Nathan Cutler
100dc64b11 Merge pull request #9167 from rjfd/wip-ceph-tool-non-ascii-chars
ceph.in: fix exception when pool name has non-ascii characters

Reviewed-by: Nathan Cutler <ncutler@suse.com>
2016-05-25 13:40:44 +02:00
Mykola Golub
20de6de8e0 Merge pull request #9282 from dillaman/wip-15993
rbd-mirror: image live-replay might become stuck

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-05-25 10:38:04 +03:00
Yehuda Sadeh
ba8ae3d146 Merge pull request #9285 from mikulely/rgw-clean-multipart-macro
rgw: cleanup RGW_MIN_MULTIPART_SIZE

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-05-25 10:30:03 +03:00
J. Eric Ivancich
9b2d4fa36e Improves the README for cmake by including quick-start developer
instructions and slightly improved markdown syntax.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
2016-05-24 17:05:46 -04:00
Kefu Chai
34b5ae8fb2 cmake: add "git-update" target for syncing git submodules
it maps the same functionality in autogen.sh

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-05-25 04:17:42 +08:00
Kefu Chai
fd66fd915a cmake: add libcephfs-java support
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-05-25 04:17:42 +08:00
Sage Weil
8f52f1199a rados: refuse cppool if the pool has selfmanaged snaps
Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-24 15:43:25 -04:00
Sage Weil
fd5f2eef1c rados: warn about losing user_version in cppool
Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-24 15:43:25 -04:00
Sage Weil
8a9769a1d5 librados: add get_pool_is_selfmanaged_snaps_mode() function
This exposes through librados whether a pool has (or had) selfmanaged
snaps.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-24 15:43:25 -04:00
Casey Bodley
9b187f2165 Merge pull request #8672 from zaitcev/wip-5073-multen-2
rgw: Add access to multi-tenancy test

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-05-24 15:26:26 -04:00
Orit Wasserman
02e84e8964 Merge pull request #8533 from theanalyst/rgw/rest-user-get
rgw_rest_admin: return -EINVAL for improper user info requests
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-05-24 20:18:03 +02:00
Orit Wasserman
3beb203a01 Merge pull request #8186 from rzarzynski/wip-rgw-bulkdel-cosm
rgw: optimize BulkDelete authorization and response printing
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-05-24 20:17:14 +02:00
Orit Wasserman
8b5bbe9ed4 Merge pull request #8093 from zaitcev/swift-root-prefix
rgw: Allow to serve Swift off the URL root
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-05-24 20:11:57 +02:00
Orit Wasserman
7151fcb0f7 Merge pull request #8053 from rzarzynski/wip-rgw-aws4-memalloc
rgw: improve memory management in AWS4 auth
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-05-24 20:11:04 +02:00
Sage Weil
407495197d osd: reject PARALLELEXEC ops with EINVAL
Errors are better than crashing.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-24 14:02:32 -04:00
Sage Weil
1aa807f4f2 ceph_test_rados_api_misc: test rados op with bad flas
Pass the bad PARALLELEXEC flag to remove(), which takes a flags arg.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-24 14:02:14 -04:00
Jason Dillaman
b9edff2174 test: use randomized write sizes for rbd-mirror stress test
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-05-24 13:22:52 -04:00
Jason Dillaman
d7b511b854 journal: eliminate watch delay for object refetches
The randomized write sizes of the modified rbd-mirror stress
test results in a lot of journal object with few entries.
Immediately fetch objects when performing a refetch check prior
to closing an empty object.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-05-24 13:22:52 -04:00
Jason Dillaman
0fb730e6be journal: keep active tag to assist with pruning watched objects
It's possible that there might be additional entries to prune in
objects that haven't been prefetched yet. Keep the active tag
to allow these entries to be pruned after they have been loaded.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-05-24 13:22:51 -04:00
Jason Dillaman
5fbf5f82de journal: update commit entry object number upon overflow
Otherwise the recorded object positions might point to an older
object that doesn't contain the actual entry.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-05-24 12:58:55 -04:00
Jason Dillaman
ff2cc27ae5 journal: cleanup watch refetch flag handling
Clear the refetch required flag while scheduling the watch
and remove the stale object after the watch completes if still
empty. Previously, it was possible for the flag to become
out-of-sync with whether or not it was actually refreshed
and pruned.

Fixes: http://tracker.ceph.com/issues/15993
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-05-24 12:58:55 -04:00
Sage Weil
a41860a501 Merge pull request #9279 from majianpeng/bluestore-uniquelock
os/bluestore/BlueStore: Fix wrong usage of std::unique_lock for OpSequencer

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-05-24 08:40:12 -04:00
Matt Benjamin
1535cd4096 Merge pull request #8741 from rzarzynski/wip-rgw-keystonev3-doc
rgw, doc: improve documentation of Keystone v3 config options
2016-05-24 07:31:30 -04:00
Hector Martin
71cca02edd pybind/rados: s/__del__/__dealloc__/
Signed-off-by: Hector Martin <marcan@marcan.st>
2016-05-24 20:30:46 +09:00
Hector Martin
c634faa66d test/pybind: explicitly remove references in tearDown
Looks like nose likes to leave references to the test instances around.
This doesn't break anything, but does cause Ioctx/Image objects to stick
around which makes debugging more complicated, as everything gets dealloced
together at the end.

Signed-off-by: Hector Martin <marcan@marcan.st>
2016-05-24 20:30:46 +09:00
Hector Martin
c14c0ac02f pybind/rbd: keep a ref to the Image in SnapIterator
Signed-off-by: Hector Martin <marcan@marcan.st>
2016-05-24 20:30:46 +09:00
Jianpeng Ma
c5740ea05f os/bluestore/BlueStore: Fix wrong usage of std::unique_lock for OpSequenecer
When set bluestore_sync_wal_apply = false, the osd must be crashed.
I add some debug message in WALWQ::_dequeue():
// preserve wal ordering for this sequencer by taking the lock
/ while still holding the queue lock
-      i->osr->wal_apply_lock.lock();
+      try {
+       i->osr->wal_apply_lock.lock();
+      } catch (const system_error& e) {
+       if (e.code() == std::errc::resource_deadlock_would_occur) {
+         assert(0 == "would deadlock");
+       } else
+         assert(0 == "other system_error");
+      }
       return i;
     }

2016-05-24 00:02:29.107165 7f0f32ea6700 -1 os/bluestore/BlueStore.h: In
function 'virtual BlueStore::TransContext* BlueStore::WALWQ::_dequeue()'
thread 7f0f32ea6700 time 2016-05-24 00:02:29.103360
os/bluestore/BlueStore.h: 489: FAILED assert(0 == "would deadlock")

 ceph version 10.2.0-1232-g21c7599 (21c759936d)
 1: (ceph::__ceph_assert_fail(char const*, char const*, int, char const*)+0x80) [0x560196215ac0]
 2: (ThreadPool::WorkQueue<BlueStore::TransContext>::_void_dequeue()+0x234)[0x560195e618b4]
 3: (ThreadPool::worker(ThreadPool::WorkThread*)+0x654) [0x560196207324]
 4: (ThreadPool::WorkThread::entry()+0x10) [0x560196208d70]
 5: (()+0x760a) [0x7f0f411d260a]
 6: (clone()+0x6d) [0x7f0f3f17a59d]
 NOTE: a copy of the executable, or `objdump -rdS <executable>` is
needed to interpret this.

This because the wron usage of std::unique_lock.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2016-05-24 17:22:32 +08:00
Boris Ranto
48225af857 Merge pull request #9218 from ceph/wip-asok-denials
rpm: Packaging fixes

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Nathan Cuthler <ncutler@suse.com>
2016-05-24 11:05:33 +02:00
Yan, Zheng
c3a20c4045 Merge pull request #8906 from david-z/wip-fix-kcephfs-symlink
mds: wrongly treat symlink inode as normal file/dir when symlink inode is stale on kcephfs
2016-05-24 02:44:24 -05:00
Jiaying Ren
ddbf341f1a rgw: cleanup RGW_MIN_MULTIPART_SIZE
As the commit 11cf9bbb29
make rgw_multipart_min_part_size as a config option,
we did not use RGW_MIN_MULTIPART_SIZE anymore.

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
2016-05-24 15:14:50 +08:00
Kefu Chai
0fa22f0d1b admin/build-doc: use doc_deps.deb.txt for build-deps instead
also update `doc_deps.deb.txt` according to the changes in build-doc.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-05-24 14:08:11 +08:00
Haomai Wang
e9c010498a Merge pull request #9281 from songbaisen/song29
msg: fix the wrong para in cpp_strerror

Reviewed-by: Kefu Chai <kefu@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
2016-05-24 14:02:29 +08:00
Kefu Chai
911d3fe9bf doc: do not doxgen src/civetweb
because it's an external project included as a git submodule

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-05-24 13:48:35 +08:00
Kefu Chai
0e00d2f21b doc,cmake: do not scan non-man pages when building man pages
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-05-24 12:58:43 +08:00
Kefu Chai
8ce8429f86 admin/build-doc: remove librbd-dev from build-dependencies
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-05-24 12:58:43 +08:00
Yan, Zheng
65827a0fd4 mds: fix race between StrayManager::{eval_stray,reintegrate_stray}
StrayManager::eval_stray() is called after Server::respond_to_request()
drops locks. So it can race with StrayManager::reintegrate_stray()

Fixes: http://tracker.ceph.com/issues/15920
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2016-05-24 11:32:30 +08:00
songbaisen
dd6bf541e4 msg: fix the wrong para in cpp_strerror
Signed-off-by:song baisen <song.baisen@zte.com.cn>
2016-05-24 10:22:34 +08:00
Matt Benjamin
45a15914c2 Merge branch 'xio-rename_XioRsp' of https://github.com/Adirl/ceph into Adirl-xio-rename_XioRsp
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-05-23 19:00:03 -04:00
Josh Durgin
ca9d87d969 Merge pull request #9235 from athanatos/wip-throttle
BackoffThrottle: fix for freebsd and avoid spinning when full

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-05-23 15:02:41 -07:00
Matt Benjamin
1f03205e8b Merge pull request #9276 from linuxbox2/xio-enqueue-2
xio: follow 03d33e59 (enqueue_for_send()->enqueue())
2016-05-23 17:24:17 -04:00
Matt Benjamin
e882f7925e xio: follow 03d33e59 (enqueue_for_send()->enqueue())
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-05-23 17:22:38 -04:00
Gregory Farnum
94dfdcdda7 Merge pull request #9275 from ktdreyer/wip-doc-cephfs-jcsp
doc: John Spray is now CephFS lead

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-05-23 14:21:33 -07:00
Ken Dreyer
b7b1ecb4d8 doc: John Spray is now CephFS lead
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2016-05-23 15:18:10 -06:00
Matt Benjamin
63c74d5f7e Merge pull request #8856 from avnerbh/fixes_4_keepalive_to_xio
xio: provide keepalive(s) and their ack(s)
2016-05-23 17:12:45 -04:00
Casey Bodley
f3a473ca00 Merge pull request #9171 from weiqiaomiao/wqm-wip-rgw-mem
rgw: fix some memory leak

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-05-23 16:55:15 -04:00
Matt Benjamin
052e639420 Merge pull request #8873 from roidayan/xio-use_xio_session_event_str
xio: use accelio api to get event str

(this is a decision for the Accelio API, we need to follow it)
2016-05-23 16:26:39 -04:00
Matt Benjamin
ffa2338f4a Merge pull request #9205 from Adirl/fix_compiltaion_entity_addr_t3
Fix compiltaion entity addr t
2016-05-23 16:24:34 -04:00