]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agologrotate: ignore postrotate error for radosgw 5881/head
Dan van der Ster [Fri, 11 Sep 2015 07:42:50 +0000 (09:42 +0200)]
logrotate: ignore postrotate error for radosgw

Fix the annoying logrotate error for radosgw.

Fixes: #13033
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
9 years agologrotate: ignore exit status 1 from killall
Dan van der Ster [Fri, 11 Sep 2015 07:30:04 +0000 (09:30 +0200)]
logrotate: ignore exit status 1 from killall

If any of ceph-osd, ceph-mon, ceph-mds were not running then
killall -q will exit status 1, leading to anacron sending a mail

  error: error running shared postrotate script for '/var/log/ceph/*.log '

Fix by overriding the exit status with || true.

Fixes: #13033
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
9 years agoMerge pull request #5800 from ceph/wip-user
Sage Weil [Thu, 10 Sep 2015 22:48:53 +0000 (18:48 -0400)]
Merge pull request #5800 from ceph/wip-user

ceph-disk: do async startup on upstart; fix dmcrypt create/activate bug

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5031 from trociny/wip-10098
David Zafman [Thu, 10 Sep 2015 20:42:09 +0000 (13:42 -0700)]
Merge pull request #5031 from trociny/wip-10098

ceph-objectstore-tool: add mark-complete operation

Reviewed-by: David Zafman <dzafman@redhat.com>
9 years agoMerge pull request #5866 from jmunhoz/wip-requestid-on-error
Yehuda Sadeh [Thu, 10 Sep 2015 20:14:40 +0000 (13:14 -0700)]
Merge pull request #5866 from jmunhoz/wip-requestid-on-error

rgw: include RequestId as part of the Error response

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #5859 from jecluis/wip-test-mon-ping
Joao Eduardo Luis [Thu, 10 Sep 2015 19:04:41 +0000 (20:04 +0100)]
Merge pull request #5859 from jecluis/wip-test-mon-ping

test: mon/mon-ping.sh: make sure 'ceph mon ping' works as expected

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5873 from dillaman/wip-rbd-missing-return
Josh Durgin [Thu, 10 Sep 2015 17:45:37 +0000 (13:45 -0400)]
Merge pull request #5873 from dillaman/wip-rbd-missing-return

rbd: missing return statement within do_metadata_remove

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agorbd: missing return statement within do_metadata_remove 5873/head
Jason Dillaman [Thu, 10 Sep 2015 16:21:57 +0000 (12:21 -0400)]
rbd: missing return statement within do_metadata_remove

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #5780 from dzafman/wip-12387
Sage Weil [Thu, 10 Sep 2015 14:56:45 +0000 (10:56 -0400)]
Merge pull request #5780 from dzafman/wip-12387

osd: When generating past intervals due to an import end at pg epoch

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agotest/Makefile-client: ship LibradosTestStub.h in tarball
Sage Weil [Thu, 10 Sep 2015 11:51:52 +0000 (07:51 -0400)]
test/Makefile-client: ship LibradosTestStub.h in tarball

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5868 from jmunhoz/wip-x-amz-request-id-doc
Loic Dachary [Thu, 10 Sep 2015 10:50:34 +0000 (12:50 +0200)]
Merge pull request #5868 from jmunhoz/wip-x-amz-request-id-doc

doc: rgw: update x-amz-request-id status

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
9 years agoMerge pull request #5863 from ceph/wip-13015
Orit Wasserman [Thu, 10 Sep 2015 10:16:03 +0000 (12:16 +0200)]
Merge pull request #5863 from ceph/wip-13015

rgw: preserve all attrs if intra-zone copy

9 years agodoc: rgw: update x-amz-request-id status 5868/head
Javier M. Mellid [Wed, 9 Sep 2015 20:07:23 +0000 (22:07 +0200)]
doc: rgw: update x-amz-request-id status

Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
9 years agorgw: include RequestId as part of the Error response 5866/head
Javier M. Mellid [Wed, 9 Sep 2015 13:56:04 +0000 (15:56 +0200)]
rgw: include RequestId as part of the Error response

The RGW error responses must contain a RequestId to be compliant with
the Amazon S3 errors. This RequestId is the ID of the request associated
with the error.

Fixes: #13020
Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
9 years agotest: mon/mon-ping.sh: make sure 'ceph mon ping' works as expected 5859/head
Joao Eduardo Luis [Wed, 9 Sep 2015 19:08:38 +0000 (20:08 +0100)]
test: mon/mon-ping.sh: make sure 'ceph mon ping' works as expected

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
9 years agoMerge pull request #5343 from hjwsm1989/wip-12442
Joao Eduardo Luis [Thu, 10 Sep 2015 08:46:58 +0000 (09:46 +0100)]
Merge pull request #5343 from hjwsm1989/wip-12442

  mon/MonClient: fix error in 'ceph ping mon.id'

Reviewed-by: Joao Eduardo Luis <joao@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoceph-objectstore-tool: add mark-complete operation 5031/head
Mykola Golub [Tue, 16 Jun 2015 08:57:08 +0000 (11:57 +0300)]
ceph-objectstore-tool: add mark-complete operation

It is supposed to be used as a last resort to fix a cluster that has
PGs in 'incomplete' state, using the following procedure:

1) stop the osd that is primary for the incomplete PG;
2) run:
  ceph-objectstore-tool --data-path ... --journal-path ... --pgid $PGID --op mark-complete
3) start the osd.

Fixes: #10098
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #5816 from dillaman/wip-librbd-gmock
Josh Durgin [Thu, 10 Sep 2015 05:47:07 +0000 (01:47 -0400)]
Merge pull request #5816 from dillaman/wip-librbd-gmock

Initial support for gmock-based unit tests in librbd

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #5557 from guangyy/wip-12666
Sage Weil [Thu, 10 Sep 2015 02:16:09 +0000 (22:16 -0400)]
Merge pull request #5557 from guangyy/wip-12666

rgw: expose the number of unhealthy workers through admin socket

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5786 from ceph/wip-12911
Josh Durgin [Thu, 10 Sep 2015 01:18:07 +0000 (21:18 -0400)]
Merge pull request #5786 from ceph/wip-12911

rbd export-diff should export data chunks in-order

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #5858 from jecluis/wip-test-mon-scrub
Loic Dachary [Thu, 10 Sep 2015 00:55:55 +0000 (02:55 +0200)]
Merge pull request #5858 from jecluis/wip-test-mon-scrub

test: mon/mon-scrub.sh: have test running on make check

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agorgw: preserve all attrs if intra-zone copy 5863/head
Yehuda Sadeh [Wed, 9 Sep 2015 22:41:02 +0000 (15:41 -0700)]
rgw: preserve all attrs if intra-zone copy

Fixes: #13015
Intra zone copy requires that all objects' attributes are preserved.
This was broken at commit: e41d97c8e38bb60d7e09e9801c0179efe7af1734

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #5442 from ceph/wip-12551
Sage Weil [Wed, 9 Sep 2015 20:21:07 +0000 (16:21 -0400)]
Merge pull request #5442 from ceph/wip-12551

ReplicatedPG,Objecter: copy_get should include truncate_seq and size

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5490 from dwj192/master
Yehuda Sadeh [Wed, 9 Sep 2015 18:38:24 +0000 (11:38 -0700)]
Merge pull request #5490 from dwj192/master

rgw:add --reset-regions for regionmap update

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agotest/Makefile.am: run mon/mon-scrub.sh as part of checks 5858/head
Joao Eduardo Luis [Wed, 9 Sep 2015 14:39:27 +0000 (15:39 +0100)]
test/Makefile.am: run mon/mon-scrub.sh as part of checks

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
9 years agotest: mon/mon-scrub.sh: port clashed with other tests
Joao Eduardo Luis [Wed, 9 Sep 2015 17:15:34 +0000 (18:15 +0100)]
test: mon/mon-scrub.sh: port clashed with other tests

This will allow the test to be run during make check.

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
9 years agoMerge pull request #5828 from lebauce/fix-swift-prefix
Yehuda Sadeh [Wed, 9 Sep 2015 15:33:59 +0000 (08:33 -0700)]
Merge pull request #5828 from lebauce/fix-swift-prefix

rgw: add delimiter to prefix only when path is specified

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agoReplicatedPG,Objecter: copy_get should include truncate_seq and size 5442/head
Samuel Just [Thu, 30 Jul 2015 23:59:32 +0000 (16:59 -0700)]
ReplicatedPG,Objecter: copy_get should include truncate_seq and size

Otherwise, we break CephFS over cache tiers.

Fixes: #12551
Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #5837 from tchaikov/wip-12968
Loic Dachary [Wed, 9 Sep 2015 11:06:47 +0000 (13:06 +0200)]
Merge pull request #5837 from tchaikov/wip-12968

mon: disable gmt_hitset if not supported

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5842 from dzafman/wip-cot-failure
Kefu Chai [Wed, 9 Sep 2015 10:12:30 +0000 (18:12 +0800)]
Merge pull request #5842 from dzafman/wip-cot-failure

test: Fix failure test to find message anywhere in stderr

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5845 from wonzhq/async-rx
Haomai Wang [Wed, 9 Sep 2015 07:20:01 +0000 (15:20 +0800)]
Merge pull request #5845 from wonzhq/async-rx

AsyncMessenger: add instance name in debug log when processing msg

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
9 years agoMerge pull request #5779 from dzafman/wip-misc-fix-guangyy
Loic Dachary [Wed, 9 Sep 2015 07:00:41 +0000 (09:00 +0200)]
Merge pull request #5779 from dzafman/wip-misc-fix-guangyy

osd: check the length of the map before accessing the first element

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5843 from dillaman/wip-12885
Josh Durgin [Wed, 9 Sep 2015 06:55:44 +0000 (02:55 -0400)]
Merge pull request #5843 from dillaman/wip-12885

librbd: diff_iterate needs to handle holes in parent images

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #5592 from xinxinsh/wip-fix-rbd-metadata
Josh Durgin [Wed, 9 Sep 2015 06:54:45 +0000 (02:54 -0400)]
Merge pull request #5592 from xinxinsh/wip-fix-rbd-metadata

fix bugs of rbd metadata operation

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agotest: Fix failure test to find message anywhere in stderr 5842/head
David Zafman [Tue, 8 Sep 2015 19:33:44 +0000 (12:33 -0700)]
test: Fix failure test to find message anywhere in stderr

Consolidate test_failure() and test_failure_tty()

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agorados: Fix usage for "notify" command
David Zafman [Tue, 8 Sep 2015 20:41:31 +0000 (13:41 -0700)]
rados: Fix usage for "notify" command

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agoMerge pull request #5834 from ceph/wip-leveldb-hang
Kefu Chai [Wed, 9 Sep 2015 04:46:03 +0000 (12:46 +0800)]
Merge pull request #5834 from ceph/wip-leveldb-hang

mon: MonitorDBStore: make get_next_key() work properly

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #4955 from kylinstorage/librados-2read-segmentation-fault-v1
Kefu Chai [Wed, 9 Sep 2015 04:45:01 +0000 (12:45 +0800)]
Merge pull request #4955 from kylinstorage/librados-2read-segmentation-fault-v1

bug fix: librados segmentation fault, when two read ops share one Aio…

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #4925 from XinzeChi/wip-hit-set-size
Kefu Chai [Wed, 9 Sep 2015 04:44:21 +0000 (12:44 +0800)]
Merge pull request #4925 from XinzeChi/wip-hit-set-size

osd: fix hit_set_map size for tier pool

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5723 from H3C/wip-msg-bugfix1
Kefu Chai [Wed, 9 Sep 2015 04:43:28 +0000 (12:43 +0800)]
Merge pull request #5723 from H3C/wip-msg-bugfix1

msg: we should set the socket options before connect or listen in order to have it take effect.

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5829 from dachary/wip-12731-jerasure-warnings
Kefu Chai [Wed, 9 Sep 2015 04:41:58 +0000 (12:41 +0800)]
Merge pull request #5829 from dachary/wip-12731-jerasure-warnings

erasure-code: fix gf-complete warnings

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoAsyncMessenger: add instance name in debug log when processing msg 5845/head
Zhiqiang Wang [Wed, 9 Sep 2015 03:40:48 +0000 (11:40 +0800)]
AsyncMessenger: add instance name in debug log when processing msg

To better debug.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
9 years agorgw:add --reset-regions for regionmap update 5490/head
dwj192 [Wed, 9 Sep 2015 01:48:16 +0000 (09:48 +0800)]
rgw:add --reset-regions for regionmap update

Fixes: #12964
Signed-off-by: Weijun Duan <duanweijun@h3c.com>
9 years agoMerge pull request #5781 from dzafman/wip-eccleanup
David Zafman [Wed, 9 Sep 2015 01:25:58 +0000 (18:25 -0700)]
Merge pull request #5781 from dzafman/wip-eccleanup

osd, test: Minor clean-up from fast-read and error handling ec changes

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agolibrbd: diff_iterate needs to handle holes in parent images 5843/head
Jason Dillaman [Tue, 8 Sep 2015 19:47:37 +0000 (15:47 -0400)]
librbd: diff_iterate needs to handle holes in parent images

If a clone's parent image snapshot includes a discarded extent,
this was previously causing an assert failure.  Instead, ignore
any discard holes in the parent image.

Fixes: #12885
Backport: hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotests: new test case for librbd diff_iterate over discard extents
Jason Dillaman [Tue, 8 Sep 2015 19:45:45 +0000 (15:45 -0400)]
tests: new test case for librbd diff_iterate over discard extents

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #5838 from ceph/wip-12861
Sage Weil [Tue, 8 Sep 2015 18:08:18 +0000 (14:08 -0400)]
Merge pull request #5838 from ceph/wip-12861

qa/workunits/rados/test_alloc_hint.sh: sudo to ls files

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5396 from XinzeChi/wip-scrub-promote
Sage Weil [Tue, 8 Sep 2015 15:41:38 +0000 (11:41 -0400)]
Merge pull request #5396 from XinzeChi/wip-scrub-promote

bug fix: osd: requeue_scrub when kick_object_context_blocked

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
9 years agoMerge pull request #5772 from yuyuyu101/wip-12912
Sage Weil [Tue, 8 Sep 2015 15:41:06 +0000 (11:41 -0400)]
Merge pull request #5772 from yuyuyu101/wip-12912

AsyncConnection: Close connection when unregistered connection met WAIT

9 years agoMerge pull request #5733 from cxwshawn/rgw-fix
Yehuda Sadeh [Tue, 8 Sep 2015 15:39:43 +0000 (08:39 -0700)]
Merge pull request #5733 from cxwshawn/rgw-fix

rgw: init_rados failed leads to repeated delete

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #5809 from rzarzynski/wip-rgw_putobj_debug_improvement
Yehuda Sadeh [Tue, 8 Sep 2015 15:35:46 +0000 (08:35 -0700)]
Merge pull request #5809 from rzarzynski/wip-rgw_putobj_debug_improvement

rgw: improve debugs in RGWPutObj and RGWPutObj_ObjStore_SWIFT.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #5567 from guce/rgw_check_key_parameter_conflict
Orit Wasserman [Tue, 8 Sep 2015 15:33:13 +0000 (17:33 +0200)]
Merge pull request #5567 from guce/rgw_check_key_parameter_conflict

rgw: add key parameter conflict check for radosgw-admin command line.

9 years agoMerge pull request #5819 from rzarzynski/wip-12950
Yehuda Sadeh [Tue, 8 Sep 2015 15:17:24 +0000 (08:17 -0700)]
Merge pull request #5819 from rzarzynski/wip-12950

rgw: don't append empty ETag HTTP header.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge remote-tracking branch 'gh/infernalis'
Sage Weil [Tue, 8 Sep 2015 15:02:54 +0000 (11:02 -0400)]
Merge remote-tracking branch 'gh/infernalis'

9 years agoqa/workunits/rados/test_alloc_hint.sh: sudo to ls files 5838/head
Kefu Chai [Tue, 8 Sep 2015 10:20:04 +0000 (18:20 +0800)]
qa/workunits/rados/test_alloc_hint.sh: sudo to ls files

The osd data dir is owned by ceph and not readable by other
non-root users.

Fixes: #12861
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5257 from t-miyamae/wip-mshec-fixlogic4
Loic Dachary [Tue, 8 Sep 2015 11:52:05 +0000 (13:52 +0200)]
Merge pull request #5257 from t-miyamae/wip-mshec-fixlogic4

erasure code: shec performance optimization by decoding cache

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agorgw: init_rados failed leads to repeated delete 5733/head
Xiaowei Chen [Tue, 8 Sep 2015 10:58:57 +0000 (06:58 -0400)]
rgw: init_rados failed leads to repeated delete

Fixes: #12978
Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
9 years agoMerge pull request #5463 from kylinstorage/wip-evict_ops
Kefu Chai [Tue, 8 Sep 2015 09:29:29 +0000 (17:29 +0800)]
Merge pull request #5463 from kylinstorage/wip-evict_ops

Allow evict operations to be throttled

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5745 from ceph/wip-12904
Kefu Chai [Tue, 8 Sep 2015 09:27:22 +0000 (17:27 +0800)]
Merge pull request #5745 from ceph/wip-12904

osd: sparse reads returning invalid extent map

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5580 from xinxinsh/wip-merge-two-setattr
Kefu Chai [Tue, 8 Sep 2015 09:26:28 +0000 (17:26 +0800)]
Merge pull request #5580 from xinxinsh/wip-merge-two-setattr

merge two continuous OP_SETATTR ops into one OP_SETATTRS

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agomon: disable gmt_hitset if not supported 5837/head
Kefu Chai [Tue, 8 Sep 2015 08:52:32 +0000 (16:52 +0800)]
mon: disable gmt_hitset if not supported

the gmt_hitset is enabled by default in the ctor of pg_pool_t, this
is intentional. because we want to remove this setting and make
gmt_hitset=true as a default in future. but this forces us to
disable it explicitly when preparing a new pool if any OSD does
not support gmt hitset.

Fixes: #12968
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agotest: mon: mon-scrub.sh: test 'mon scrub' 5834/head
Joao Eduardo Luis [Tue, 8 Sep 2015 08:48:41 +0000 (09:48 +0100)]
test: mon: mon-scrub.sh: test 'mon scrub'

In its current state is used to catch regressions on 'ceph mon scrub'
hanging due to an infinite loop.

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
9 years agoMerge pull request #5785 from liewegas/wip-12861
Sage Weil [Mon, 7 Sep 2015 14:40:37 +0000 (10:40 -0400)]
Merge pull request #5785 from liewegas/wip-12861

qa/workunits/rados/test_alloc_hint.sh: sudo to list files

9 years agomon: MonitorDBStore: make get_next_key() work properly
Joao Eduardo Luis [Mon, 7 Sep 2015 13:12:19 +0000 (14:12 +0100)]
mon: MonitorDBStore: make get_next_key() work properly

We introduced a significant bug with 2cc7aee, when we fixed issue #11786.
Although that patch would fix the problem described in #11786, we
managed to not increment the iterator upon returning the current key.
This would have the iterator iterating over the same key, forever and
ever.

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
9 years agoMerge pull request #5784 from dachary/wip-docker-helper
Kefu Chai [Mon, 7 Sep 2015 11:45:51 +0000 (19:45 +0800)]
Merge pull request #5784 from dachary/wip-docker-helper

fix docker-test.sh for CentOS 7

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agotests: drop docker-tests.sh root and /dev support 5784/head
Loic Dachary [Wed, 2 Sep 2015 23:37:03 +0000 (01:37 +0200)]
tests: drop docker-tests.sh root and /dev support

Now that ceph-disk.sh activation tests switched to the ceph-disk suite
as found in https://github.com/ceph/ceph-qa-suite/tree/master/suites/ceph-disk,
it does not need for root and /dev support from docker-tests.sh. There
currently is no other use case and since it's generally not a good idea
to run anything as root in a container anyway.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agotests: CentOS 7 needs systemd-container
Loic Dachary [Wed, 2 Sep 2015 23:23:45 +0000 (01:23 +0200)]
tests: CentOS 7 needs systemd-container

It is now needed by the Ceph dependencies and won't work unless the fake
version of it is replaced by the actual one.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agorgw: add delimiter to prefix only when path is specified 5828/head
Sylvain Baubeau [Fri, 4 Sep 2015 20:51:44 +0000 (22:51 +0200)]
rgw: add delimiter to prefix only when path is specified

http://tracker.ceph.com/issues/12960
Fixes: #12960
Signed-off-by: Sylvain Baubeau <sbaubeau@redhat.com>
9 years agoMerge pull request #5728 from trociny/wip-12706-infernalis
Loic Dachary [Mon, 7 Sep 2015 07:39:23 +0000 (09:39 +0200)]
Merge pull request #5728 from trociny/wip-12706-infernalis

ceph-disk: use /sys/dev/block/maj:min/partition to see if partition

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agorefine tests for metadata ops 5592/head
xinxin shu [Mon, 17 Aug 2015 10:55:35 +0000 (18:55 +0800)]
refine tests for metadata ops

Signed-off-by: xinxin shu <xinxin.shu@intel.com>
9 years agoimprove error handle of rbd metadata operation & format output
xinxin shu [Mon, 17 Aug 2015 10:15:04 +0000 (18:15 +0800)]
improve error handle of rbd metadata operation & format output

Signed-off-by: xinxin shu <xinxin.shu@intel.com>
9 years agofix metadata loading error if we open an image
xinxin shu [Mon, 17 Aug 2015 05:14:08 +0000 (13:14 +0800)]
fix metadata loading error if we open an image

Signed-off-by: xinxin shu <xinxin.shu@intel.com>
9 years agomsg: we should set the socket options before connect or listen in order to have it... 5723/head
Ruifeng Yang [Mon, 7 Sep 2015 01:05:38 +0000 (09:05 +0800)]
msg: we should set the socket options before connect or listen in order to have it take effect.

Signed-off-by: Ruifeng Yang <149233652@qq.com>
9 years agoerasure-code: fix gf-complete warnings 5829/head
Loic Dachary [Sun, 6 Sep 2015 22:40:29 +0000 (00:40 +0200)]
erasure-code: fix gf-complete warnings

Update to the latest gf-complete v2 branch which has the compilation
warning fixed. In addition the default compilation flag upstream has
been set to display such warnings.

git log --oneline --graph d384952c68a64d93ac7af6341d5519ea5d2958b9..9caeefbf2860e56a75502f4d3342deed5b5ba265
9caeefb add -Wsign-compare and address the warnings
5979f98 gf_w64.c: fix integer overflow
93a9845 gf_w64.c: fix integer overflow
513c87b gf_w64.c: fix integer overflow
4d6fa89 gf_w64.c: fix integer overflow

http://tracker.ceph.com/issues/12731 Fixes: #12731

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge remote-tracking branch 'gh/infernalis'
Sage Weil [Sun, 6 Sep 2015 21:50:03 +0000 (17:50 -0400)]
Merge remote-tracking branch 'gh/infernalis'

9 years agoMerge pull request #4895 from XinzeChi/wip-outdata-set
Sage Weil [Sun, 6 Sep 2015 21:43:37 +0000 (17:43 -0400)]
Merge pull request #4895 from XinzeChi/wip-outdata-set

bug fix: osd: avoid multi set osd_op.outdata in tier pool

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5707 from athanatos/wip-12809
Sage Weil [Sun, 6 Sep 2015 21:43:24 +0000 (17:43 -0400)]
Merge pull request #5707 from athanatos/wip-12809

PG::handle_advance_map: on_pool_change after handling the map change

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5751 from yuyuyu101/wip-12908
Sage Weil [Sun, 6 Sep 2015 21:42:48 +0000 (17:42 -0400)]
Merge pull request #5751 from yuyuyu101/wip-12908

AsyncConnection: Don't use unsafe feature as message encode feature

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge remote-tracking branch 'gh/infernalis'
Sage Weil [Sun, 6 Sep 2015 18:19:39 +0000 (14:19 -0400)]
Merge remote-tracking branch 'gh/infernalis'

9 years agoqa/workunits/post-file.sh: sudo
Sage Weil [Sat, 5 Sep 2015 13:28:17 +0000 (09:28 -0400)]
qa/workunits/post-file.sh: sudo

Only root can read the key in /usr/share/...

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: dump full map bl at 20 when crc doesn't match
Sage Weil [Sun, 6 Sep 2015 17:56:38 +0000 (13:56 -0400)]
osd: dump full map bl at 20 when crc doesn't match

This will help us debug cases where the encoding doesn't match due
to a bug.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5827 from tchaikov/wip-doc-daemon
Loic Dachary [Sun, 6 Sep 2015 11:46:09 +0000 (13:46 +0200)]
Merge pull request #5827 from tchaikov/wip-doc-daemon

doc: fix the typo in command example

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agodoc: fix the typo in command example 5827/head
Kefu Chai [Sun, 6 Sep 2015 11:28:31 +0000 (19:28 +0800)]
doc: fix the typo in command example

always indent using tab, the rendered html looks good, but it helps with
editor to highlight the codeblock properly.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5817 from liewegas/wip-ceph-daemon
Loic Dachary [Sat, 5 Sep 2015 21:49:42 +0000 (23:49 +0200)]
Merge pull request #5817 from liewegas/wip-ceph-daemon

doc: 'ceph --admin-daemon ...' -> 'ceph daemon ...'

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5193 from SUSE/wip-babeltrace-suse
Ken Dreyer [Fri, 4 Sep 2015 21:37:24 +0000 (15:37 -0600)]
Merge pull request #5193 from SUSE/wip-babeltrace-suse

ceph.spec.in: fix lttng/babeltrace conditionals

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
9 years agoMerge pull request #5796 from SUSE/wip-group-cond
Ken Dreyer [Fri, 4 Sep 2015 21:36:52 +0000 (15:36 -0600)]
Merge pull request #5796 from SUSE/wip-group-cond

ceph.spec.in: put distro conditionals around Group:

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
9 years agodoc: 'ceph --admin-daemon ...' -> 'ceph daemon ...' 5817/head
Sage Weil [Fri, 4 Sep 2015 19:59:34 +0000 (15:59 -0400)]
doc: 'ceph --admin-daemon ...' -> 'ceph daemon ...'

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agotests: base gmock class support for librbd 5816/head
Jason Dillaman [Fri, 4 Sep 2015 19:01:38 +0000 (15:01 -0400)]
tests: base gmock class support for librbd

Created mock classes to represent a few central librbd classes
and a basic gmock test fixture for future gmock-based unit tests.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: support templating of ImageCtx for async state machines
Jason Dillaman [Fri, 4 Sep 2015 18:59:09 +0000 (14:59 -0400)]
librbd: support templating of ImageCtx for async state machines

This will facilitate the creation of unit test mocks to verify
non-librados actions. The templates (by default) will be flagged
as extern to avoid the translation unit bloat.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #5624 from vumrao/wip-vumrao-12714
Yehuda Sadeh [Fri, 4 Sep 2015 18:11:03 +0000 (11:11 -0700)]
Merge pull request #5624 from vumrao/wip-vumrao-12714

rgw : setting max number of buckets for users via ceph.conf option

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoceph.spec.in: put distro conditional around Group: 5796/head
Nathan Cutler [Sat, 1 Aug 2015 07:30:59 +0000 (09:30 +0200)]
ceph.spec.in: put distro conditional around Group:

Neither RHEL and Fedora require a Group: line, so retain
only for SLE/openSUSE (and set the right value for these distros)

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #5798 from SUSE/wip-fix-license
Ken Dreyer [Fri, 4 Sep 2015 17:38:10 +0000 (11:38 -0600)]
Merge pull request #5798 from SUSE/wip-fix-license

ceph.spec.in: fix License line

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
9 years agolibrados_test_stub: add mock class for IoCtx operations
Jason Dillaman [Tue, 18 Aug 2015 00:51:50 +0000 (20:51 -0400)]
librados_test_stub: add mock class for IoCtx operations

Unit tests can now use gmock to simulate responses from the OSDs
via a mocked librados library.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #5801 from dreamhost/wip-12939-header
Yehuda Sadeh [Fri, 4 Sep 2015 17:21:19 +0000 (10:21 -0700)]
Merge pull request #5801 from dreamhost/wip-12939-header

Fix casing of Content-Type header

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #5811 from vumrao/wip-vumrao-12944
Loic Dachary [Fri, 4 Sep 2015 16:58:44 +0000 (18:58 +0200)]
Merge pull request #5811 from vumrao/wip-vumrao-12944

doc: Add pgcalc tool link in placement-groups document

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoceph.spec.in: fix lttng/babeltrace conditionals 5193/head
Nathan Cutler [Wed, 15 Jul 2015 10:54:20 +0000 (12:54 +0200)]
ceph.spec.in: fix lttng/babeltrace conditionals

lttng and babeltrace are build dependencies for rbd-replay-prep. Make
sure the right package names are used. Enable for SLE12, as well as
for openSUSE 13.1 and higher.

Move the BuildRequires out of the ceph-test subpackage and into the
distro-conditional dependencies section.

Make ordering of BuildRequires a little more alphabetical.

http://tracker.ceph.com/issues/12360 Fixes: #12360

Signed-off-by: Nathan Cutler <ncutler@suse.com>
sqme

9 years agoMerge pull request #5791 from SUSE/wip-drop-lsb-release
Ken Dreyer [Fri, 4 Sep 2015 15:48:04 +0000 (09:48 -0600)]
Merge pull request #5791 from SUSE/wip-drop-lsb-release

ceph.spec.in: drop lsb-release dependency from ceph-common

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
9 years agorgw: don't append empty ETag HTTP header. 5819/head
Radoslaw Zarzynski [Fri, 4 Sep 2015 13:11:35 +0000 (15:11 +0200)]
rgw: don't append empty ETag HTTP header.

Fixes: #12950
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agoMerge pull request #5808 from ceph/wip-simplify-logrotate
Sage Weil [Fri, 4 Sep 2015 13:02:24 +0000 (09:02 -0400)]
Merge pull request #5808 from ceph/wip-simplify-logrotate

logrotate.conf: Simplify log files reopening after log rotation

Reviewed-by: Milan Broz <mbroz@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agodoc: Add pgcalc tool link in placement-groups document 5811/head
Vikhyat Umrao [Fri, 4 Sep 2015 11:25:13 +0000 (16:55 +0530)]
doc: Add pgcalc tool link in placement-groups document

Fixes #12944

Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>