Commit Graph

52115 Commits

Author SHA1 Message Date
Adam C. Emerson
778506ed7d time: Change temporary variable types in time decode
Since we're decoding 32-bit integers, just use uint32_t and then cast them to
what utime_t expects.

Fixes: http://tracker.ceph.com/issues/15330
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2016-04-04 10:56:30 -04:00
Casey Bodley
77ccd20d90 Merge pull request #8422 from ceph/wip-fix-cmake
CMake: For CMake version <= 2.8.11, use LINK_PRIVATE
2016-04-04 10:35:20 -04:00
Sage Weil
4a88a7f1ce librados: fix narrow race with tid return value assignment
The completion should be done by the time op_submit returns.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-04 10:28:56 -04:00
Sage Weil
b7eb86fe30 osdc/Objecter: fix narrow race with tid assignment
The operation completion could finish and be freed before we
do the info->register_tid assignment.  Avoid this by doing the
assignment in _op_submit itself.

Fixes: #14364
Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-04 10:28:56 -04:00
Casey Bodley
969d62827c Merge pull request #8410 from theanalyst/rgw/help-args
rgw: add a few more help options in admin interface
2016-04-04 10:28:38 -04:00
Sage Weil
77aee99835 Merge pull request #8393 from jcsp/wip-15309-2
qa: update rest test cephfs calls (part 2)

Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-04 09:42:57 -04:00
Sage Weil
1de73d7ec8 qa/workunits/rest/test.py: fs flag set enable_multiple true
This lets us run against a vstart cluster.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-04 09:39:03 -04:00
Sage Weil
42e692a9ff ceph-rest-api: do not include single-option CephChoices in prefix
This breaks commands like

COMMAND("fs flag set name=flag_name,type=CephChoices,strings=enable_multiple "
        "name=val,type=CephString", \
	"Set a global CephFS flag", \
	"fs", "rw", "cli,rest")

with only one option:

PUT fs/flag/set?flag_name=enable_multiple&val=true:  400
FAILURE: url  http://localhost:5000/api/v0.1/fs/flag/set?flag_name=enable_multiple&val=true
expected 200, got 400
Response content:  <html><body><table border=1><th>Possible commands:</th><th>Method</th><th>Description</th><tr><td>fs/flag/set?flag_name=enable_multiple&amp;va
l=val(&lt;string&gt;)
</td><td>PUT</td><td>Set a global CephFS flag</td></tr>
</table></body></html>

...and I can't tell why it's there.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-04 09:38:26 -04:00
Sage Weil
5aedc215e7 Merge pull request #8402 from ilc/master
configure: Add -D_LARGEFILE64_SOURCE to Linux build.
2016-04-04 09:32:12 -04:00
Sage Weil
6d5855814b Merge pull request #8420 from dzafman/wip-15347
test: Fix test to run with btrfs which has snap_### dirs

Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-04 08:56:23 -04:00
Sage Weil
79582b04f6 Merge pull request #8423 from wjin/fix
osdmap: rm nonused variable

Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-04 08:55:53 -04:00
Sage Weil
f203d56cd1 qa/workunits/rbd: qemu tests need to wait for image to be createdReviewe
qa/workunits/rbd: qemu tests need to wait for image to be created

Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-04 08:55:14 -04:00
Sage Weil
01a56dc81c Merge pull request #8427 from ghxandsky/master
set 128MB tcmalloc cache size by bytes
2016-04-04 08:54:11 -04:00
Star Guo
9565a50c58 set 128MB tcmalloc cache size by bytes
Signed-off-by: Star Guo <star.guo@mevoco.com>
2016-04-04 13:41:52 +08:00
Sage Weil
548fb8b2d4 Merge pull request #8314 from dx9/wip-unittest-erasure-code-plugin
unittest_erasure_code_plugin: fix deadlock (Alpine)
2016-04-03 18:13:28 -04:00
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
Samuel Just
554d1b4f59 ReplicatedPG::_rollback_to: update the OMAP flag
We don't simply copy over the whole flag field because not all values
should necessarily be carried over from the clone.  Particularly,
FLAG_CACHE_PIN should not be overridden.

Fixes: http://tracker.ceph.com/issues/14777
Backport: hammer, infernalis
Signed-off-by: Samuel Just <sjust@redhat.com>
2016-04-01 14:38:12 -07: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
xie xingguo
85229f6d55 mds: fix potential null pointer access
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-04-01 16:54:16 +08:00