Commit Graph

53692 Commits

Author SHA1 Message Date
Yann Dupont
f6db6a4b7b mailmap: Ignacio Bravo affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-06-07 19:47:33 +02:00
Yann Dupont
c3072585b8 mailmap: wangsongbo affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-06-07 19:47:32 +02:00
Yann Dupont
1d33ae1113 mailmap: Haodong Tang affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-06-07 19:47:32 +02:00
Yann Dupont
7d4848eb04 mailmap: Zhuang Xiaochun affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-06-07 19:47:32 +02:00
Yann Dupont
d405ad4296 mailmap: Shinobu Kinjo affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-06-07 19:47:32 +02:00
Yann Dupont
4b89878424 mailmap: Frank S. Filz affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-06-07 19:47:32 +02:00
Yann Dupont
2d215d550c mailmap: Ramana Raja affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-06-07 19:47:32 +02:00
Yann Dupont
4819b29dc1 mailmap: Bryan Stillwell affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-06-07 19:47:32 +02:00
Yann Dupont
a6e2c360d4 mailmap: Alexandre Derumier affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-06-07 19:47:32 +02:00
Yann Dupont
20cb190ea1 mailmap: Tamil Muthamizhan affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-06-07 19:47:32 +02:00
Yann Dupont
e6bb412183 mailmap: Chang-Yi Lee affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-06-07 19:47:26 +02:00
Yann Dupont
549ac0f46e mailmap: Dan Horák affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-05-24 22:41:35 +02:00
Yann Dupont
1652359954 mailmap: Ramesh Chander affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-05-24 22:41:35 +02:00
Yann Dupont
8a318b316b mailmap: Yongqiang He affiliation / name normalization
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-05-24 22:39:38 +02:00
Yann Dupont
1625888c16 mailmap: Mike christie affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-05-24 22:39:38 +02: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
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
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
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
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
Casey Bodley
2fcb7b91e5 Merge pull request #9229 from oritwas/wip-15937
rgw: add missing metadata_heap pool to old zones

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-05-23 16:07:09 -04:00
Boris Ranto
6de39ce737 rpm: Restore /var/run/ceph context manually
The fixfiles command won't fix label for /var/run/ceph (/run is probably
excluded from relabel), we need to restore the context manually.

Signed-off-by: Boris Ranto <branto@redhat.com>
2016-05-23 21:59:14 +02:00
Boris Ranto
3c104b1065 rpm: Mute semodule in postun script
Currently, we don't mute the semodule output in postun script. This
results in the following message when removing ceph-selinux package:

libsemanage.semanage_direct_remove_key: Removing last ceph module (no
other ceph module exists at another priority).

The fix is to simply mute the output of the command.

Signed-off-by: Boris Ranto <branto@redhat.com>
2016-05-23 21:59:14 +02:00
Boris Ranto
bef5ea7833 Revert "rpm: put /sbin/ldconfig into -p"
This reverts commit a53d932fc4.

If the interpret is passed to postun script, everything until the next
rpm section gets interpreted as the input for the interpret (in this
case ldconfig). This results in warnings like

/sbin/ldconfig: relative path `0' used to build cache

when removing the packages that pass the interpret because we use
several '#' characters to separate the subpackage sections and these get
passed to the ldconfig.

Using the default interpret (bash) fixes the warning. I'm also doing the
same to %post script for consistency.

Signed-off-by: Boris Ranto <branto@redhat.com>
2016-05-23 21:58:38 +02:00
Samuel Just
6f835726a7 BackoffThrottle: wait() if past max
Otherwise, we risk spinning on wait_for() with a small
delay.

Fixes: http://tracker.ceph.com/issues/15953
Signed-off-by: Samuel Just <sjust@redhat.com>
2016-05-23 10:37:15 -07:00
Samuel Just
846808ff3f BackoffThrottle: use wait_for instead of wait_until
On some platforms, wait_until won't surrender the lock
with a negative argument.

Signed-off-by: Samuel Just <sjust@redhat.com>
2016-05-23 10:37:14 -07:00
Casey Bodley
0120d271bd Merge pull request #9249 from tchaikov/wip-cmake-ocf
cmake: add ocf support

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-05-23 10:53:15 -04:00
Boris Ranto
bdd85cd4fe Merge pull request #9227 from ceph/rpm-autosetup-kdreyer
ceph.spec.in: use %autosetup macro

Reviewed-by: Nathan Cuthler <ncutler@suse.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
2016-05-23 16:34:42 +02:00
Kefu Chai
4711fe1cae Merge pull request #9147 from flaf/master
doc: update required packages list to build doc

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-05-23 22:20:54 +08:00
Sage Weil
23d329f5a6 Merge pull request #9247 from cxwshawn/wip-tc4-fix
global: optimize header file dependency.

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-23 09:51:27 -04:00
Sage Weil
7f1049d1d7 Merge pull request #9251 from cxwshawn/wip-tc5-fix
client: optimize header file dependency.

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-23 09:50:50 -04:00
Sage Weil
d8efaa117f osd/HitSet.h: add 'override' to virtual functionsReviewed-by: Kefu Chai <kchai@redhat.com>
osd/HitSet.h: add 'override' to virtual functions

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-05-23 09:50:13 -04:00
Sage Weil
b8e73de44c Merge pull request #9255 from yuyuyu101/wip-test-msgr-fix
test_msgr: add verbose info for pending connections

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-23 09:48:56 -04:00