]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agorgw: multipart part copy, fix regression 13219/head
Yehuda Sadeh [Fri, 30 Sep 2016 05:20:10 +0000 (22:20 -0700)]
rgw: multipart part copy, fix regression

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 66fbe9384703c004c01783eb664f55895d310439)

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agorgw: minor optimization
Yehuda Sadeh [Fri, 30 Sep 2016 00:44:08 +0000 (17:44 -0700)]
rgw: minor optimization

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 4919dc9987c6376d3d4e143702c26417449524c5)

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agorgw: rgw_obj_key use adjustment in multipart copy part
Yehuda Sadeh [Fri, 30 Sep 2016 00:43:00 +0000 (17:43 -0700)]
rgw: rgw_obj_key use adjustment in multipart copy part

This fixes a case where objects start with double underscore.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 29fece3545cc1df404a25eec46706b16f893a5df)

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agorgw: multipart copy-part handle versionId
Yehuda Sadeh [Fri, 30 Sep 2016 00:43:35 +0000 (17:43 -0700)]
rgw: multipart copy-part handle versionId

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 53521efffb1cb92e5f5ce992d4127bf9498d7c33)

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agorgw: multipart copy part minor parsing cleanup
Yehuda Sadeh [Thu, 29 Sep 2016 21:24:13 +0000 (14:24 -0700)]
rgw: multipart copy part minor parsing cleanup

no need for range.size()

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 6e9b824d5d4017239d58b4752ebc43bfad8f698d)

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agorgw: multipart copy, check for empty bucket, improve logging
Yehuda Sadeh [Thu, 29 Sep 2016 21:11:43 +0000 (14:11 -0700)]
rgw: multipart copy, check for empty bucket, improve logging

also reduce log level for non critical user errors.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 2bcb3d286b230ef917d5ba96c8276a942f544689)

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agorgw: multipart copy part, chunked read
Yehuda Sadeh [Thu, 29 Sep 2016 21:07:14 +0000 (14:07 -0700)]
rgw: multipart copy part, chunked read

Don't read the entire range from source object, read it in parts.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 4049e47a0cfc1eef6efd502590b68ba7234589d3)

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agorgw: doc: add multipart uploads copy part feature as supported
Javier M. Mellid [Tue, 26 Jul 2016 12:56:50 +0000 (14:56 +0200)]
rgw: doc: add multipart uploads copy part feature as supported

Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
(cherry picked from commit 8a7ebeee2ff3f10ceb23b7fa43e43c3c450efe22)

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agorgw: multipart uploads copy part support
Javier M. Mellid [Tue, 26 Jul 2016 12:53:44 +0000 (14:53 +0200)]
rgw: multipart uploads copy part support

Add multipart uploads copy part feature.

Fixes: http://tracker.ceph.com/issues/12790
Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
(cherry picked from commit 949480c2e9760855ed6a0501d364d5e766c8207d)

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agoMerge pull request #13146 from dzafman/wip-18502-jewel-zafman
David Zafman [Fri, 24 Mar 2017 15:13:02 +0000 (08:13 -0700)]
Merge pull request #13146 from dzafman/wip-18502-jewel-zafman

jewel: osd: Scrub improvements and other fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14100 from smithfarm/wip-18781
Nathan Cutler [Thu, 23 Mar 2017 15:49:13 +0000 (16:49 +0100)]
Merge pull request #14100 from smithfarm/wip-18781

Manually merge PR#13143 which was mistakenly merged to jewel-next

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
8 years agoMerge branch 'jewel-next' into jewel 14100/head
Nathan Cutler [Thu, 23 Mar 2017 08:46:53 +0000 (09:46 +0100)]
Merge branch 'jewel-next' into jewel

Branch "jewel-next" was merged to jewel on Dec 22 (5b402f8a7b), and then PR
https://github.com/ceph/ceph/pull/13143 merged to jewel-next much later (Feb
1st), and then jewel-next was never merged to jewel again before we tagged
v10.2.6.

This merge brings in a single commit, i.e. the one from
https://github.com/ceph/ceph/pull/13143

Reported-by: Ken Dreyer <kdreyer@redhat.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #13952 from smithfarm/wip-fix-merge-error
Zack Cerza [Tue, 14 Mar 2017 15:19:28 +0000 (09:19 -0600)]
Merge pull request #13952 from smithfarm/wip-fix-merge-error

tests: fix merge error in rgw/singleton/all/radosgw-admin.yaml

8 years agotests: fix merge error in rgw/singleton/all/radosgw-admin.yaml 13952/head
Nathan Cutler [Tue, 14 Mar 2017 00:26:23 +0000 (01:26 +0100)]
tests: fix merge error in rgw/singleton/all/radosgw-admin.yaml

Introduced by 94d5888c

Reported-by: Robin H. Johnson <robin.johnson@dreamhost.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years ago10.2.6 v10.2.6
Jenkins Build Slave User [Tue, 7 Mar 2017 13:29:40 +0000 (13:29 +0000)]
10.2.6

8 years agoMerge pull request #13749 from zmc/wip-openstack-volumes-jewel
Zack Cerza [Thu, 2 Mar 2017 21:00:13 +0000 (14:00 -0700)]
Merge pull request #13749 from zmc/wip-openstack-volumes-jewel

qa/suites/upgrade/hammer-x: Add some volumes

8 years agoqa/suites/upgrade/hammer-x: Add some volumes 13749/head
Zack Cerza [Thu, 2 Mar 2017 17:57:54 +0000 (10:57 -0700)]
qa/suites/upgrade/hammer-x: Add some volumes

Signed-off-by: Zack Cerza <zack@redhat.com>
8 years agoMerge pull request #13708 from zmc/wip-openstack-volumes-jewel
Zack Cerza [Wed, 1 Mar 2017 23:35:37 +0000 (16:35 -0700)]
Merge pull request #13708 from zmc/wip-openstack-volumes-jewel

qa/suites/ceph-deploy: Drop OpenStack volume count

8 years agoqa/suites/ceph-deploy: Drop OpenStack volume count 13708/head
Zack Cerza [Tue, 28 Feb 2017 20:07:15 +0000 (13:07 -0700)]
qa/suites/ceph-deploy: Drop OpenStack volume count

Looks like we only need two per node, since there is only one OSD per
node, and ceph-deploy wants two disks per OSD to account for the
journal.

Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit 87072e277c9ef259c9ee2ae1f761e252aa216713)

8 years agoMerge pull request #13710 from tmuthamizhan/wip-mv-centos-version
Yuri Weinstein [Wed, 1 Mar 2017 15:26:30 +0000 (07:26 -0800)]
Merge pull request #13710 from tmuthamizhan/wip-mv-centos-version

qa: replace centos 7.2 with centos 7.3

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
8 years agoMerge pull request #13705 from ceph/wip_remove_dumpling_jewel
Yuri Weinstein [Wed, 1 Mar 2017 00:05:32 +0000 (16:05 -0800)]
Merge pull request #13705 from ceph/wip_remove_dumpling_jewel

qa: Removed dumplin test 13234.yaml as not needed anymore

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoqa: replace centos 7.2 with centos 7.3 13710/head
Tamil Muthamizhan [Wed, 1 Mar 2017 00:02:57 +0000 (16:02 -0800)]
qa: replace centos 7.2 with centos 7.3

s/centos_7.2/centos_7.3

Signed-off-by: Tamil Muthamizhan <tmuthami@redhat.com>
8 years agoRemoved dumplin test 13234.yaml as not needed anymore 13705/head
Yuri Weinstein [Tue, 28 Feb 2017 23:17:54 +0000 (15:17 -0800)]
Removed dumplin test 13234.yaml as not needed anymore

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
8 years agoMerge pull request #13674 from zmc/wip-openstack-volumes-jewel
Zack Cerza [Mon, 27 Feb 2017 19:23:18 +0000 (12:23 -0700)]
Merge pull request #13674 from zmc/wip-openstack-volumes-jewel

qa/suites/{ceph-ansible,rest}: OpenStack volumes

8 years agoqa/suites/rest: Openstack volumes 13674/head
Zack Cerza [Mon, 27 Feb 2017 16:14:41 +0000 (09:14 -0700)]
qa/suites/rest: Openstack volumes

Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit 99d942145f4206c00aca30c0bb74f0edc4bac798)

8 years agoqa/suites/ceph-ansible: Openstack volumes
Zack Cerza [Mon, 27 Feb 2017 16:06:26 +0000 (09:06 -0700)]
qa/suites/ceph-ansible: Openstack volumes

Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit 964b983bdbd412311bce56184d12d1b6d43c7f28)

8 years agoMerge pull request #13642 from zmc/wip-fs-openstack-jewel
Zack Cerza [Sat, 25 Feb 2017 00:22:17 +0000 (17:22 -0700)]
Merge pull request #13642 from zmc/wip-fs-openstack-jewel

qa/suites/fs: Add openstack volume configuration

8 years agoqa/suites/fs: Add openstack volume configuration 13642/head
Zack Cerza [Fri, 24 Feb 2017 22:25:19 +0000 (15:25 -0700)]
qa/suites/fs: Add openstack volume configuration

Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit b076d89a3f1fbad7d477913812b2e17529abeacf)

8 years agoMerge pull request #13639 from zmc/wip-openstack-volumes-jewel
Zack Cerza [Fri, 24 Feb 2017 21:44:10 +0000 (14:44 -0700)]
Merge pull request #13639 from zmc/wip-openstack-volumes-jewel

qa/suites/{knfs,hadoop,samba}: OpenStack volume configuration

8 years agoMerge pull request #13636 from zmc/wip-kcephfs-openstack-jewel
Zack Cerza [Fri, 24 Feb 2017 21:43:40 +0000 (14:43 -0700)]
Merge pull request #13636 from zmc/wip-kcephfs-openstack-jewel

qa/suites/kcephfs: Openstack volume configuration

8 years agoqa/suites/samba: Openstack volume configuration 13639/head
Zack Cerza [Fri, 24 Feb 2017 20:46:54 +0000 (13:46 -0700)]
qa/suites/samba: Openstack volume configuration

Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit e0296d706422ea4dc01d84f8786f6f7104c3d996)

8 years agoqa/suites/hadoop: Openstack volume configuration
Zack Cerza [Fri, 24 Feb 2017 20:45:18 +0000 (13:45 -0700)]
qa/suites/hadoop: Openstack volume configuration

Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit 3fef0a49da2ccfdceba7b98e9096be8305da1111)

8 years agoqa/suites/knfs: Add openstack volume configuration
Zack Cerza [Fri, 24 Feb 2017 20:44:33 +0000 (13:44 -0700)]
qa/suites/knfs: Add openstack volume configuration

Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit 62c6fd3371adf0f420c12d9c7e2b3a2a0c69256b)

8 years agoqa/suites/kcephfs: Openstack volume configuration 13636/head
Zack Cerza [Fri, 24 Feb 2017 20:37:23 +0000 (13:37 -0700)]
qa/suites/kcephfs: Openstack volume configuration

(cherry picked from commit ec6fb28eaf8e2db327e4afc115879a40c7664e07)
Signed-off-by: Zack Cerza <zack@redhat.com>
8 years agoMerge pull request #13632 from zmc/wip-krbd-openstack-jewel
Zack Cerza [Fri, 24 Feb 2017 19:15:41 +0000 (12:15 -0700)]
Merge pull request #13632 from zmc/wip-krbd-openstack-jewel

qa/suites/krbd: Add openstack volume configuration

8 years agoMerge pull request #13612 from ceph/wip-rgw-openstack-jewel
Zack Cerza [Fri, 24 Feb 2017 19:15:22 +0000 (12:15 -0700)]
Merge pull request #13612 from ceph/wip-rgw-openstack-jewel

qa/suites/rgw: Add openstack volume configuration

8 years agoqa/suites/krbd: Add openstack volume configuration 13632/head
Zack Cerza [Fri, 24 Feb 2017 18:17:45 +0000 (11:17 -0700)]
qa/suites/krbd: Add openstack volume configuration

Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit 201b4d0d1e92bf95ac6a8f2951b664763030f12d)

8 years agoqa/suites/rgw: Add openstack volume configuration 13612/head
Zack Cerza [Thu, 23 Feb 2017 17:14:05 +0000 (10:14 -0700)]
qa/suites/rgw: Add openstack volume configuration

Without this, OSDs will fail to create on instances whose root fs isn't
xfs.

(cherry picked from commit 8af4c35f9577ef5a88307ea5cbbe2561a473926c)
Signed-off-by: Zack Cerza <zack@redhat.com>
8 years agoMerge pull request #13184 from smithfarm/wip-18720-jewel
Nathan Cutler [Thu, 23 Feb 2017 15:32:20 +0000 (16:32 +0100)]
Merge pull request #13184 from smithfarm/wip-18720-jewel

jewel: build/ops: systemd restarts Ceph Mon to quickly after failing to start

8 years agoMerge pull request #13240 from smithfarm/wip-18804-jewel
Loic Dachary [Thu, 23 Feb 2017 06:32:01 +0000 (07:32 +0100)]
Merge pull request #13240 from smithfarm/wip-18804-jewel

jewel: tests: ignore bogus ceph-objectstore-tool error in ceph_manager

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #13058 from wido/issue-18635-jewel
Loic Dachary [Thu, 23 Feb 2017 06:30:30 +0000 (07:30 +0100)]
Merge pull request #13058 from wido/issue-18635-jewel

jewel: systemd: Restart Mon after 10s in case of failure

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #13048 from SUSE/wip-18457-jewel
Loic Dachary [Thu, 23 Feb 2017 06:28:16 +0000 (07:28 +0100)]
Merge pull request #13048 from SUSE/wip-18457-jewel

jewel: selinux: Allow ceph to manage tmp files

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #13131 from ovh/bp-osdmap-hammer-compat
Nathan Cutler [Wed, 22 Feb 2017 21:59:41 +0000 (22:59 +0100)]
Merge pull request #13131 from ovh/bp-osdmap-hammer-compat

jewel: mon: OSDMonitor: clear jewel+ feature bits when talking to Hammer OSD

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #13255 from liewegas/wip-enxio-jewel
Nathan Cutler [Wed, 22 Feb 2017 21:36:07 +0000 (22:36 +0100)]
Merge pull request #13255 from liewegas/wip-enxio-jewel

jewel: osd: do not send ENXIO on misdirected op by default

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #13050 from SUSE/wip-18406-jewel
Nathan Cutler [Tue, 21 Feb 2017 20:40:14 +0000 (21:40 +0100)]
Merge pull request #13050 from SUSE/wip-18406-jewel

jewel: tests: Cannot reserve CentOS 7.2 smithi machines

8 years agoMerge pull request #13459 from ukernel/jewel-18708
Nathan Cutler [Tue, 21 Feb 2017 09:27:51 +0000 (10:27 +0100)]
Merge pull request #13459 from ukernel/jewel-18708

jewel: mds: fix incorrect assertion in Server::_dir_is_nonempty()

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #13533 from smithfarm/wip-stress-split-ec
Sage Weil [Mon, 20 Feb 2017 16:20:58 +0000 (10:20 -0600)]
Merge pull request #13533 from smithfarm/wip-stress-split-ec

jewel: qa/suites/upgrade/hammer-x: break stress split ec symlinks

8 years agoMerge pull request #13222 from liewegas/wip-hammer-x-jewel
Sage Weil [Mon, 20 Feb 2017 16:20:51 +0000 (10:20 -0600)]
Merge pull request #13222 from liewegas/wip-hammer-x-jewel

jewel: tests: qa/suites/upgrade/hammer-x/stress-split: finish thrashing before final upgrade

8 years agoMerge pull request #13273 from asheplyakov/jewel-bp-18773
Loic Dachary [Mon, 20 Feb 2017 15:42:59 +0000 (16:42 +0100)]
Merge pull request #13273 from asheplyakov/jewel-bp-18773

jewel: rgw: fix period update crash

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #13341 from dreamhost/wip-17550-jewel
Loic Dachary [Mon, 20 Feb 2017 15:41:56 +0000 (16:41 +0100)]
Merge pull request #13341 from dreamhost/wip-17550-jewel

jewel: rgw: bucket resharding

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
8 years agoMerge pull request #13004 from asheplyakov/jewel-bp-18563
Loic Dachary [Mon, 20 Feb 2017 15:41:29 +0000 (16:41 +0100)]
Merge pull request #13004 from asheplyakov/jewel-bp-18563

jewel: rgw: leak from RGWMetaSyncShardCR::incremental_sync

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agotests: reduce stress-split-erasure-code-x86_64 dependency on stress-split 13533/head
Nathan Cutler [Mon, 20 Feb 2017 10:44:49 +0000 (11:44 +0100)]
tests: reduce stress-split-erasure-code-x86_64 dependency on stress-split

This patch breaks the symlinks for two files from stress-split that
are being changed by https://github.com/ceph/ceph/pull/13222 in a way
that would break this test otherwise.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #12754 from Abhishekvrshny/wip-18285-jewel
Loic Dachary [Mon, 20 Feb 2017 10:48:26 +0000 (11:48 +0100)]
Merge pull request #12754 from Abhishekvrshny/wip-18285-jewel

jewel: rbd: partition func should be enabled When load nbd.ko for rbd-nbd

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #13183 from smithfarm/wip-17313-jewel
Loic Dachary [Mon, 20 Feb 2017 10:45:29 +0000 (11:45 +0100)]
Merge pull request #13183 from smithfarm/wip-17313-jewel

jewel: build/ops: add ldap lib to rgw lib deps based on build config

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agotests: reduce stress-split-erasure-code dependency on stress-split
Nathan Cutler [Mon, 20 Feb 2017 10:44:49 +0000 (11:44 +0100)]
tests: reduce stress-split-erasure-code dependency on stress-split

This patch breaks the symlinks for two files from stress-split that
are being changed by https://github.com/ceph/ceph/pull/13222 in a way
that would break this test otherwise.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #13502 from tmuthamizhan/wip-ansible-rm-trusty
Yuri Weinstein [Fri, 17 Feb 2017 22:43:00 +0000 (14:43 -0800)]
Merge pull request #13502 from tmuthamizhan/wip-ansible-rm-trusty

qa: drop ubuntu trusty support

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
8 years agoqa: drop ubuntu trusty support 13502/head
Tamil Muthamizhan [Fri, 17 Feb 2017 21:06:43 +0000 (21:06 +0000)]
qa: drop ubuntu trusty support

ceph-ansible dropped support for OS that doesnt support systemd

Signed-off-by: Tamil Muthamizhan <tmuthami@redhat.com>
8 years agoMerge pull request #13276 from rzarzynski/wip-rgw-18364-2-jewel
Loic Dachary [Thu, 16 Feb 2017 21:27:53 +0000 (22:27 +0100)]
Merge pull request #13276 from rzarzynski/wip-rgw-18364-2-jewel

jewel: rgw: be aware abount tenants on cls_user_bucket -> rgw_bucket conversion

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #12729 from liupan1111/wip-fix-disable-rgw-compile-error
Loic Dachary [Thu, 16 Feb 2017 15:30:56 +0000 (16:30 +0100)]
Merge pull request #12729 from liupan1111/wip-fix-disable-rgw-compile-error

jewel: build/ops: fixed compilation error when --with-radowsgw=no

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #12239 from liupan1111/wip-fix-makefile-bug
Loic Dachary [Thu, 16 Feb 2017 14:43:32 +0000 (15:43 +0100)]
Merge pull request #12239 from liupan1111/wip-fix-makefile-bug

jewel: build/ops: fixed the issue when --disable-server, compilation fails.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agomds: fix incorrect assertion in Server::_dir_is_nonempty() 13459/head
Yan, Zheng [Wed, 18 Jan 2017 08:23:49 +0000 (16:23 +0800)]
mds: fix incorrect assertion in Server::_dir_is_nonempty()

when filelock is in XLOCKDONE state. client of xlocker can rdlock
the filelock. In that case, only client of xlocker can read the lock.

Fixes: http://tracker.ceph.com/issues/18708
Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit fe4ab52b30079a785be053a9fd0197d6990737fe)

8 years agoMerge pull request #12380 from dachary/wip-18183-jewel
Loic Dachary [Wed, 15 Feb 2017 22:39:11 +0000 (23:39 +0100)]
Merge pull request #12380 from dachary/wip-18183-jewel

jewel: cephfs metadata pool: deep-scrub error omap_digest != best guess omap_digest

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #13130 from rjfd/wip-18608-jewel
Loic Dachary [Wed, 15 Feb 2017 16:08:26 +0000 (17:08 +0100)]
Merge pull request #13130 from rjfd/wip-18608-jewel

jewel: librbd: allow to open an image without opening parent image

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #13233 from smithfarm/wip-18556-jewel
Loic Dachary [Wed, 15 Feb 2017 16:06:53 +0000 (17:06 +0100)]
Merge pull request #13233 from smithfarm/wip-18556-jewel

jewel: rbd: Potential race when removing two-way mirroring image

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #13113 from jcsp/wip-18679
Loic Dachary [Wed, 15 Feb 2017 09:48:21 +0000 (10:48 +0100)]
Merge pull request #13113 from jcsp/wip-18679

jewel: mds: finish clientreplay requests before requesting active state

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #13139 from jcsp/wip-18100
Loic Dachary [Wed, 15 Feb 2017 09:47:59 +0000 (10:47 +0100)]
Merge pull request #13139 from jcsp/wip-18100

jewel: mds: fix MDSMap upgrade decoding

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #12490 from linuxbox2/jewel-rgw-header
Loic Dachary [Wed, 15 Feb 2017 09:18:04 +0000 (10:18 +0100)]
Merge pull request #12490 from linuxbox2/jewel-rgw-header

jewel: rgw: add option to log custom HTTP headers (rgw_log_http_headers)

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #12079 from rzarzynski/wip-rgw-17961
Loic Dachary [Wed, 15 Feb 2017 09:14:23 +0000 (10:14 +0100)]
Merge pull request #12079 from rzarzynski/wip-rgw-17961

jewel: rgw: TempURL properly handles accounts created with the implicit tenant

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoMerge pull request #12044 from Abhishekvrshny/wip-17886-jewel
Loic Dachary [Wed, 15 Feb 2017 09:13:32 +0000 (10:13 +0100)]
Merge pull request #12044 from Abhishekvrshny/wip-17886-jewel

jewel: rgw: multisite: ECANCELED & 500 error on bucket delete

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoMerge pull request #13422 from smithfarm/wip-fix-hammer-x-fix
Nathan Cutler [Tue, 14 Feb 2017 23:39:48 +0000 (00:39 +0100)]
Merge pull request #13422 from smithfarm/wip-fix-hammer-x-fix

tests: remove extra indentation in exec block

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
8 years agoMerge pull request #13364 from tmuthamizhan/wip-ansible-jewel
Tamilarasi Muthamizhan [Tue, 14 Feb 2017 21:59:58 +0000 (13:59 -0800)]
Merge pull request #13364 from tmuthamizhan/wip-ansible-jewel

qa: ceph-ansible smoke suite modified for jewel

8 years agotests: remove extra indentation in exec block 13422/head
Nathan Cutler [Tue, 14 Feb 2017 21:13:37 +0000 (22:13 +0100)]
tests: remove extra indentation in exec block

The exec block was indented by an extra space, causing

line 439, in parse_block_mapping_key
    "expected <block end>, but found %r" % token.id, token.start_mark)
yaml.parser.ParserError: while parsing a block mapping
  in "<string>", line 111, column 3:
      sequential:
      ^
expected <block end>, but found '<block sequence start>'
  in "<string>", line 126, column 4:
       - exec:
       ^

when trying to run upgrade/hammer-x

Reported-by: Yuri Weinstein <yweins@redhat.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #13404 from smithfarm/wip-fix-hammer-x
Sage Weil [Tue, 14 Feb 2017 00:44:37 +0000 (18:44 -0600)]
Merge pull request #13404 from smithfarm/wip-fix-hammer-x

tests: add require_jewel_osds to upgrade/hammer-x/tiering

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
8 years agotests: add require_jewel_osds to upgrade/hammer-x/tiering 13404/head
Nathan Cutler [Mon, 13 Feb 2017 21:04:17 +0000 (22:04 +0100)]
tests: add require_jewel_osds to upgrade/hammer-x/tiering

Without this, the test tends to fail, but sometimes passes (apparently because
the "wait-for-healthy: true" in the last ceph.restart is racy - HEALTH_OK is
received before the MONs notice that all OSDs are running jewel without
require_jewel_osds.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agolibrbd: async method to check journal tag owner 13233/head
Mykola Golub [Wed, 31 Aug 2016 19:49:36 +0000 (22:49 +0300)]
librbd: async method to check journal tag owner

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit 953561f84140efcc870ec4a8f1ecb732b8e99409)

Conflicts:
src/librbd/Journal.cc - trivial context difference (master does not
                                have "class SafeTimerSingleton"),
                                added "typedef ::journal::Journaler Journaler;" in
                                C_IsTagOwner template to fix build failure

8 years agorbd-mirror: check image mirroring state when bootstrapping
Mykola Golub [Mon, 9 Jan 2017 09:40:46 +0000 (10:40 +0100)]
rbd-mirror: check image mirroring state when bootstrapping

Fixes: http://tracker.ceph.com/issues/18447
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit 5fc5a8ac895524f05eed6e7db20b0dda3a8cb60f)

8 years agorbd-mirror: async request to test if image is primary
Mykola Golub [Mon, 9 Jan 2017 08:23:19 +0000 (09:23 +0100)]
rbd-mirror: async request to test if image is primary

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit 0a1cb35caacdf85029f31a0364dc07a5d7462f5f)

Conflicts:
src/tools/rbd_mirror/CMakeLists.txt - file doesn't exist in jewel
            (ported the patch to src/tools/Makefile-client.am)
src/tools/rbd_mirror/image_replayer/BootstrapRequest.cc - Journal is
             implemented by a typedef in jewel
src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc -
             no compat.h include in jewel, Journal is implemented by a typedef
             in jewel

8 years agoMerge pull request #13331 from smithfarm/wip-18869-jewel
Loic Dachary [Mon, 13 Feb 2017 07:20:53 +0000 (08:20 +0100)]
Merge pull request #13331 from smithfarm/wip-18869-jewel

jewel: tests: SUSE yaml facets in qa/distros/all are out of date

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #11410 from dachary/wip-17334-jewel
Kefu Chai [Mon, 13 Feb 2017 06:52:59 +0000 (14:52 +0800)]
Merge pull request #11410 from dachary/wip-17334-jewel

jewel: crushtool --compile is create output despite of missing item

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agotest/cli/crushtool: fix the test of compile-decompile-recompile.t 11410/head
Kefu Chai [Wed, 21 Sep 2016 14:58:49 +0000 (22:58 +0800)]
test/cli/crushtool: fix the test of compile-decompile-recompile.t

should read the map from $TESTDIR,
it's a regression introduced by b2c0a07

Fixes: http://tracker.ceph.com/issues/17306
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 404043980d7882f320f48fbaed4b18f31bb15eb7)

8 years agocrush/CrushCompiler: error out as long as parse fails
Kefu Chai [Tue, 20 Sep 2016 06:10:16 +0000 (14:10 +0800)]
crush/CrushCompiler: error out as long as parse fails

do not output compiled crush map if anything goes wrong when parsing
crush map.

Fixes: http://tracker.ceph.com/issues/17306
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit b2c0a079dc074c907e1bc429861230096534f597)

8 years agoqa: ceph-ansible smoke suite modified for jewel 13364/head
Tamil Muthamizhan [Fri, 10 Feb 2017 20:37:51 +0000 (12:37 -0800)]
qa: ceph-ansible smoke suite modified for jewel

Signed-off-by: Tamil Muthamizhan <tmuthami@redhat.com>
8 years agoMerge pull request #13358 from linuxbox2/wip-jewel-marker
Matt Benjamin [Fri, 10 Feb 2017 20:04:02 +0000 (15:04 -0500)]
Merge pull request #13358 from linuxbox2/wip-jewel-marker

jewel: rgw: fix use of marker in List::list_objects()

8 years agorgw: fix use of marker in List::list_objects() 13358/head
Yehuda Sadeh [Fri, 27 Jan 2017 00:26:42 +0000 (16:26 -0800)]
rgw: fix use of marker in List::list_objects()

Fixes: http://tracker.ceph.com/issues/18331
List marker is an index key, so treat it as such. This
fixes infinite loop in orphans find command.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit a5d1fa0587184f43c69d8e03114b58d43f320781)

8 years agoBackport bucket reshard to jewel. 13341/head
Robin H. Johnson [Thu, 9 Feb 2017 22:38:02 +0000 (14:38 -0800)]
Backport bucket reshard to jewel.

Fixes: http://tracker.ceph.com/issues/17756
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
8 years agorgw_admin: add a few admin commands to the usage
Yehuda Sadeh [Tue, 4 Oct 2016 00:00:41 +0000 (17:00 -0700)]
rgw_admin: add a few admin commands to the usage

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 91ed1216d7465a42d11546cb967c70997ea5b1d8)
See: http://tracker.ceph.com/issues/17556
See: https://github.com/ceph/ceph/pull/11368
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
8 years agorgw_admin: add bi purge command
Yehuda Sadeh [Mon, 3 Oct 2016 23:43:44 +0000 (16:43 -0700)]
rgw_admin: add bi purge command

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit aaf0d213eb39192ceb252c9c7db68c1a48ba1272)
See: http://tracker.ceph.com/issues/17556
See: https://github.com/ceph/ceph/pull/11368
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
8 years agorgw: bucket resharding, adjust logging
Yehuda Sadeh [Wed, 28 Sep 2016 19:54:47 +0000 (12:54 -0700)]
rgw: bucket resharding, adjust logging

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit e2b8dc6113e2625bdf65ea6f2c42510229d04c87)
See: http://tracker.ceph.com/issues/17556
See: https://github.com/ceph/ceph/pull/11368
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
8 years agocls/rgw: bi_list() fix is_truncated returned param
Yehuda Sadeh [Wed, 28 Sep 2016 17:41:45 +0000 (10:41 -0700)]
cls/rgw: bi_list() fix is_truncated returned param

is_truncated was never set. Also, make sure that we don't return
more entries than requested.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 47f422a4e0382d53023af6f651433011606b8625)
See: http://tracker.ceph.com/issues/17556
See: https://github.com/ceph/ceph/pull/11368
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
8 years agorgw_admin: require --yes-i-really-mean-it for bucket reshard
Yehuda Sadeh [Tue, 27 Sep 2016 22:13:37 +0000 (15:13 -0700)]
rgw_admin: require --yes-i-really-mean-it for bucket reshard

in the case where num shards are less or equal to current bucket

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 75da4375ee0e36c58f96cbf2920c3b9aadf12733)
See: http://tracker.ceph.com/issues/17556
See: https://github.com/ceph/ceph/pull/11368
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
8 years agorgw_admin: better bucket reshard logging
Yehuda Sadeh [Tue, 27 Sep 2016 21:35:31 +0000 (14:35 -0700)]
rgw_admin: better bucket reshard logging

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit ac88b5d9e6bc3c8b59c500bf79a0e3daa923a47c)
See: http://tracker.ceph.com/issues/17556
See: https://github.com/ceph/ceph/pull/11368
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
8 years agorgw: limit bucket reshard num shards to max possible
Yehuda Sadeh [Tue, 27 Sep 2016 21:11:41 +0000 (14:11 -0700)]
rgw: limit bucket reshard num shards to max possible

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit d9c88afec4b52848f9ad8957bab5a86fdafecded)
See: http://tracker.ceph.com/issues/17556
See: https://github.com/ceph/ceph/pull/11368
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
8 years agorgw_admin: fix bi list command
Yehuda Sadeh [Tue, 27 Sep 2016 18:55:32 +0000 (11:55 -0700)]
rgw_admin: fix bi list command

Changes scoping of json section, and push the --object param in so that
an object can be specified as a filter.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 716d096bbb8e836aefa6a451b799389d3bd85620)
See: http://tracker.ceph.com/issues/17556
See: https://github.com/ceph/ceph/pull/11368
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
8 years agorgw_admin: use aio operations for bucket resharding
Yehuda Sadeh [Mon, 26 Sep 2016 22:49:37 +0000 (15:49 -0700)]
rgw_admin: use aio operations for bucket resharding

also created shards manager to make things slightly cleaner

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 97e7ee9ca213ccf4b8f537e02125bd0c4ef24103)
See: http://tracker.ceph.com/issues/17556
See: https://github.com/ceph/ceph/pull/11368
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
8 years agorgw: bucket reshard updates stats
Yehuda Sadeh [Mon, 26 Sep 2016 17:45:17 +0000 (10:45 -0700)]
rgw: bucket reshard updates stats

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit dd712384ffe72ee23cbe0a20d7400aff7fb779a8)
See: http://tracker.ceph.com/issues/17556
See: https://github.com/ceph/ceph/pull/11368
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
8 years agocls/rgw: add bucket_update_stats method
Yehuda Sadeh [Mon, 26 Sep 2016 16:52:29 +0000 (09:52 -0700)]
cls/rgw: add bucket_update_stats method

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 4cc7d3a33a28602b45ec04ff5384e6bc62b376cb)
See: http://tracker.ceph.com/issues/17556
See: https://github.com/ceph/ceph/pull/11368
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
8 years agorgw_admin: reshard also links to new bucket instance
Yehuda Sadeh [Sat, 24 Sep 2016 17:46:36 +0000 (10:46 -0700)]
rgw_admin: reshard also links to new bucket instance

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 094fe3f0cfeb27b32abfc93b07054b60de363a20)
See: http://tracker.ceph.com/issues/17556
See: https://github.com/ceph/ceph/pull/11368
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
8 years agorgw: rgw_link_bucket, use correct bucket structure for entry point
Yehuda Sadeh [Sat, 24 Sep 2016 17:33:57 +0000 (10:33 -0700)]
rgw: rgw_link_bucket, use correct bucket structure for entry point

The bucket structure might be different than the one that we were using
before.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit f2d9fc015556d6d70e596f75c382cc7157add411)
See: http://tracker.ceph.com/issues/17556
See: https://github.com/ceph/ceph/pull/11368
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
8 years agoradosgw-admin: bucket reshard needs --num-shards to be specified
Yehuda Sadeh [Sat, 24 Sep 2016 17:01:00 +0000 (10:01 -0700)]
radosgw-admin: bucket reshard needs --num-shards to be specified

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit d0569f913340cb251c1a49f1e470b176d8b34346)
See: http://tracker.ceph.com/issues/17556
See: https://github.com/ceph/ceph/pull/11368
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
8 years agocls/rgw: fix bi_list objclass command
Yehuda Sadeh [Sat, 24 Sep 2016 12:49:37 +0000 (05:49 -0700)]
cls/rgw: fix bi_list objclass command

was filtering entries, even if filter was not specified, and need to
set boundary for plain entries. Also, list_instance_entries() was not
working correctly, and added list_olh_entries().

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit f87c4b2c2a6ecadaf9f0e0cfef4b6061878a023b)
See: http://tracker.ceph.com/issues/17556
See: https://github.com/ceph/ceph/pull/11368
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>