]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agoRevert "osdc/Journaler: make header write_pos align to boundary of flushed entry" 16282/head
Nathan Cutler [Wed, 12 Jul 2017 06:40:20 +0000 (08:40 +0200)]
Revert "osdc/Journaler: make header write_pos align to boundary of flushed entry"

This reverts commit 2e299b50de4a297fee2aec21290632336d239857.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agoRevert "osdc/Journaler: avoid executing on_safe contexts prematurely"
Nathan Cutler [Wed, 12 Jul 2017 06:40:13 +0000 (08:40 +0200)]
Revert "osdc/Journaler: avoid executing on_safe contexts prematurely"

This reverts commit 06cf9f365033f7913051bdf4060f0bc6fc0444d7.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years ago10.2.8 v10.2.8
Jenkins Build Slave User [Thu, 6 Jul 2017 14:56:18 +0000 (14:56 +0000)]
10.2.8

8 years agoMerge pull request #14710 from smithfarm/wip-start-race
Nathan Cutler [Tue, 4 Jul 2017 15:43:57 +0000 (17:43 +0200)]
Merge pull request #14710 from smithfarm/wip-start-race

tests: rados: sleep before ceph tell osd.0 flush_pg_stats after restart

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
8 years agoMerge pull request #16089 from ceph/wip_fix_point_jewel
Yuri Weinstein [Tue, 4 Jul 2017 14:31:50 +0000 (07:31 -0700)]
Merge pull request #16089 from ceph/wip_fix_point_jewel

qa/Fixed upgrade sequence to 10.2.0 -> 10.2.7 -> latest -x (10.2.8)

Reviewed-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #16088 from smithfarm/wip-fix-client-upgrade-centos
Yuri Weinstein [Tue, 4 Jul 2017 00:23:43 +0000 (17:23 -0700)]
Merge pull request #16088 from smithfarm/wip-fix-client-upgrade-centos

tests: run upgrade/client-upgrade on latest CentOS 7.3

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
8 years agoFixed upgrade sequence to 10.2.0 -> 10.2.7 -> latest -x (10.2.8) 16089/head
Yuri Weinstein [Mon, 3 Jul 2017 21:18:14 +0000 (14:18 -0700)]
Fixed upgrade sequence to 10.2.0 -> 10.2.7 -> latest -x (10.2.8)

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
8 years agotests: run upgrade/client-upgrade on latest CentOS 7.3 16088/head
Nathan Cutler [Mon, 3 Jul 2017 20:55:21 +0000 (22:55 +0200)]
tests: run upgrade/client-upgrade on latest CentOS 7.3

Before this patch, all centos jobs were failing because there are no longer any
CentOS 7.2 machines in Sepia.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #15504 from Vicente-Cheng/wip-20151-jewel
Nathan Cutler [Fri, 30 Jun 2017 14:43:38 +0000 (16:43 +0200)]
Merge pull request #15504 from Vicente-Cheng/wip-20151-jewel

jewel: ceph-disk: do not setup_statedir on trigger

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #15904 from smithfarm/wip-20413-jewel
Nathan Cutler [Wed, 28 Jun 2017 08:20:23 +0000 (10:20 +0200)]
Merge pull request #15904 from smithfarm/wip-20413-jewel

jewel: tests: upgrade:hammer-x/stress-split-erasure-code-x86_64 fails in 10.2.8 integration testing

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
8 years agoMerge pull request #14930 from smithfarm/wip-19829-jewel
Nathan Cutler [Wed, 28 Jun 2017 06:16:33 +0000 (08:16 +0200)]
Merge pull request #14930 from smithfarm/wip-19829-jewel

jewel: tests: New upgrade test for #14930

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #14392 from asheplyakov/19508-jewel
Nathan Cutler [Wed, 28 Jun 2017 06:16:04 +0000 (08:16 +0200)]
Merge pull request #14392 from asheplyakov/19508-jewel

jewel: osd: pg_pool_t::encode(): be compatible with Hammer <= 0.94.6

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agotests: upgrade/hammer-x/v0-94-6-mon-overload: tweak packages list 14930/head
Nathan Cutler [Sun, 25 Jun 2017 08:32:16 +0000 (10:32 +0200)]
tests: upgrade/hammer-x/v0-94-6-mon-overload: tweak packages list

Include some hammer dependencies that aren't in the jewel default packages
list, and exclude some java packages that may not be in the hammer repo and are
not needed for the upgrade test in any case.

N.B.: This cannot be cherry-picked from master because upgrade/hammer-x was
dropped in master.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agotests: upgrade/hammer-x: new v0-94-6-mon-overload subsuite
Nathan Cutler [Wed, 3 May 2017 09:39:27 +0000 (11:39 +0200)]
tests: upgrade/hammer-x: new v0-94-6-mon-overload subsuite

This is not a cherry-pick from master because direct upgrades
from hammer to kraken+ are not supported.

Fixes: http://tracker.ceph.com/issues/19829
References: http://tracker.ceph.com/issues/19508
Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #15936 from batrick/i20412
Nathan Cutler [Tue, 27 Jun 2017 10:41:59 +0000 (12:41 +0200)]
Merge pull request #15936 from batrick/i20412

qa: enable quotas for pre-luminous quota tests

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
8 years agoqa: enable quotas for pre-luminous quota tests 15936/head
Patrick Donnelly [Tue, 27 Jun 2017 02:04:48 +0000 (19:04 -0700)]
qa: enable quotas for pre-luminous quota tests

This cannot be cherry-picked from master because the config option is removed
since 0f250a889dba2100d3afcea0a18e4f6a8d086b86.

Fixes: http://tracker.ceph.com/issues/20412
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoMerge pull request #15933 from smithfarm/wip-hammer-jewel-x
Sage Weil [Tue, 27 Jun 2017 02:24:11 +0000 (21:24 -0500)]
Merge pull request #15933 from smithfarm/wip-hammer-jewel-x

jewel: tests: drop upgrade/hammer-jewel-x

8 years agotests: drop upgrade/hammer-jewel-x 15933/head
Nathan Cutler [Tue, 27 Jun 2017 00:27:22 +0000 (02:27 +0200)]
tests: drop upgrade/hammer-jewel-x

This suite doesn't have any test logic in it. Its existence in the jewel branch
appears to be an oversight.

This cannot be cherry-picked from master because the upgrade/hammer-jewel-x
suite is present (and justified) in master and is not currently being dropped
there.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #15438 from Vicente-Cheng/wip-20027-jewel
John Spray [Mon, 26 Jun 2017 20:25:12 +0000 (16:25 -0400)]
Merge pull request #15438 from Vicente-Cheng/wip-20027-jewel

jewel: mds: issue new caps when sending reply to client

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #15000 from jan--f/wip-19846-jewel
John Spray [Mon, 26 Jun 2017 20:23:48 +0000 (16:23 -0400)]
Merge pull request #15000 from jan--f/wip-19846-jewel

jewel: cephfs: normalize file open flags internally used by cephfs

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #15383 from asheplyakov/20014-bp-jewel
Nathan Cutler [Mon, 26 Jun 2017 16:25:03 +0000 (18:25 +0200)]
Merge pull request #15383 from asheplyakov/20014-bp-jewel

jewel: cls/rgw: list_plain_entries() stops before bi_log entries

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoMerge pull request #15870 from smithfarm/wip-swift-task-move-jewel
Zack Cerza [Mon, 26 Jun 2017 16:17:03 +0000 (10:17 -0600)]
Merge pull request #15870 from smithfarm/wip-swift-task-move-jewel

tests: move swift.py task from teuthology to ceph, phase one (jewel)

8 years agoMerge pull request #15842 from smithfarm/wip-sortbitwise-jewel
Nathan Cutler [Mon, 26 Jun 2017 07:24:04 +0000 (09:24 +0200)]
Merge pull request #15842 from smithfarm/wip-sortbitwise-jewel

qa/suites/upgrade/hammer-x: set "sortbitwise" for jewel clusters

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15468 from smithfarm/wip-20140-jewel
John Spray [Sun, 25 Jun 2017 23:59:40 +0000 (19:59 -0400)]
Merge pull request #15468 from smithfarm/wip-20140-jewel

jewel: cephfs: Journaler may execute on_safe contexts prematurely

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agotests: swift.py: tweak imports 15870/head
Nathan Cutler [Sun, 25 Jun 2017 10:42:36 +0000 (12:42 +0200)]
tests: swift.py: tweak imports

The ".." form only works within the teuthology repo. With swift.py now in the
Ceph repo, we have to be explicit.

Error message was: "ValueError: Attempted relative import beyond toplevel
package

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agotests: upgrade/hammer-x/stress-split: tweak packages list 15904/head
Nathan Cutler [Sun, 25 Jun 2017 08:27:58 +0000 (10:27 +0200)]
tests: upgrade/hammer-x/stress-split: tweak packages list

Include some hammer dependencies that aren't in the jewel default packages
list, and exclude some java packages that may not be in the hammer repo and are
not needed for the upgrade test in any case.

N.B.: This cannot be cherry-picked from master because upgrade/hammer-x was
dropped in master.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agotests: swift.py: clone the ceph-jewel branch
Nathan Cutler [Sun, 25 Jun 2017 07:27:47 +0000 (09:27 +0200)]
tests: swift.py: clone the ceph-jewel branch

The master branch of ceph/swift.git contains tests that are incompatible with
Jewel and Hammer. The ceph-jewel branch omits these tests.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #15472 from smithfarm/wip-20148-jewel
John Spray [Fri, 23 Jun 2017 12:02:48 +0000 (08:02 -0400)]
Merge pull request #15472 from smithfarm/wip-20148-jewel

jewel: mds: Too many stat ops when trying to probe a large file

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge branch 'master' of /home/smithfarm/src/ceph/upstream/teuthology into wip-swift...
Nathan Cutler [Fri, 23 Jun 2017 06:35:27 +0000 (08:35 +0200)]
Merge branch 'master' of /home/smithfarm/src/ceph/upstream/teuthology into wip-swift-task-move-jewel

8 years agotests: move swift.py task to qa/tasks
Nathan Cutler [Fri, 23 Jun 2017 06:27:42 +0000 (08:27 +0200)]
tests: move swift.py task to qa/tasks

In preparation for moving this task from ceph/teuthology.git into ceph/ceph.git

The move is necessary because jewel-specific changes are needed, yet teuthology
does not maintain a separate branch for jewel. Also, swift.py is a
Ceph-specific task so it makes more sense to have it in Ceph.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #15529 from badone/wip-async-sleep-timer-fix-jewel
Nathan Cutler [Thu, 22 Jun 2017 20:07:23 +0000 (22:07 +0200)]
Merge pull request #15529 from badone/wip-async-sleep-timer-fix-jewel

jewel:  osd: Implement asynchronous scrub sleep

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoqa/suites/upgrade/hammer-x: set "sortbitwise" for jewel clusters 15842/head
Nathan Cutler [Thu, 22 Jun 2017 09:32:42 +0000 (11:32 +0200)]
qa/suites/upgrade/hammer-x: set "sortbitwise" for jewel clusters

Inspired by 3734280522a913ca8340ebc98b80978f63bade6f

This cannot be cherry-picked from master because master does not have
qa/suites/upgrade/hammer-x

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #15824 from tchaikov/jewel
Kefu Chai [Thu, 22 Jun 2017 03:59:51 +0000 (11:59 +0800)]
Merge pull request #15824 from tchaikov/jewel

qa/workunits/rados/test-upgrade-*: whitelist tests the right way

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoqa/workunits/rados/test-upgrade-*: whitelist tests the right way 15824/head
Kefu Chai [Thu, 22 Jun 2017 00:06:43 +0000 (08:06 +0800)]
qa/workunits/rados/test-upgrade-*: whitelist tests the right way

--gtest_filter=POSTIVE_PATTERNS[-NEGATIVE_PATTERNS], so we cannot add
multiple exclusive patterns using -pattern:-pattern, instead, we should
use: -pattern:pattern

Signed-off-by: Kefu Chai <kchai@redhat.com>
Conflicts:
        qa/workunits/rados/test-upgrade-v11.0.0.sh: this change is not
    cherry-picked from master, because the clone-range op was removed
    from master. and only supported in pre-luminous releases.

8 years agoMerge pull request #14661 from smithfarm/wip-19575-jewel
Nathan Cutler [Tue, 20 Jun 2017 20:54:00 +0000 (22:54 +0200)]
Merge pull request #14661 from smithfarm/wip-19575-jewel

jewel: rgw: unsafe access in RGWListBucket_ObjStore_SWIFT::send_response()

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #15778 from tchaikov/wip-upgrade-without-clone-range-jewel
Kefu Chai [Tue, 20 Jun 2017 14:42:47 +0000 (22:42 +0800)]
Merge pull request #15778 from tchaikov/wip-upgrade-without-clone-range-jewel

qa/workunits/rados/test-upgrade-*: whitelist tests for master

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agojewel: osd: pg_pool_t::encode(): be compatible with Hammer <= 0.94.6 14392/head
Alexey Sheplyakov [Fri, 7 Apr 2017 08:34:20 +0000 (12:34 +0400)]
jewel: osd: pg_pool_t::encode(): be compatible with Hammer <= 0.94.6

This patch is necessary for Jewel only since direct upgrades from Hammer
to Kraken and newer are not supported.

Fixes: http://tracker.ceph.com/issues/19508
Signed-off-by: Alexey Sheplyakov <asheplyakov@mirantis.com>
8 years agoqa/workunits/rados/test-upgrade-*: whitelist tests for master 15778/head
Kefu Chai [Tue, 20 Jun 2017 11:49:14 +0000 (19:49 +0800)]
qa/workunits/rados/test-upgrade-*: whitelist tests for master

The jewel-x upgrade test now runs this script against a mixed cluster on
a machine with code from master installed.  That means we have to
skip any new tests that will fail on a mixed cluster. CloneRange was
removed in 0d7b0b7.

Signed-off-by: Kefu Chai <kchai@redhat.com>
Conflicts:
    qa/workunits/rados/test-upgrade-v11.0.0.sh: this change is not
cherry-picked from master, because the clone-range op was removed from
master. and only supported in pre-luminous releases.

8 years agomds: issue new caps when sending reply to client 15438/head
Yan, Zheng [Sat, 22 Apr 2017 04:27:12 +0000 (12:27 +0800)]
mds: issue new caps when sending reply to client

After Locker::issue_new_caps() adds new Capability data struct,
do not issue caps immediately. Let CInode::encode_inodestate()
do the job instead. This can avoid various races that early reply
is not allowed, caps that haven't been sent to client gets revoked.

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

8 years agoceph-disk: do not setup_statedir on trigger 15504/head
Loic Dachary [Thu, 1 Jun 2017 09:37:20 +0000 (11:37 +0200)]
ceph-disk: do not setup_statedir on trigger

trigger may run when statedir is unavailable and does not use it.

Fixes: http://tracker.ceph.com/issues/19941
Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit 16bfbdd3d9988523bba31aace516c303057daa58)

8 years agotests: rados: sleep before ceph tell osd.0 flush_pg_stats after restart 14710/head
Nathan Cutler [Fri, 21 Apr 2017 09:05:05 +0000 (11:05 +0200)]
tests: rados: sleep before ceph tell osd.0 flush_pg_stats after restart

Even though we wait for HEALTH_OK after restarting the daemons, they are not
ready to respond to flush_pg_stats.

The reason why the osd is not ready for "tell" command after "ceph health"
shows that the cluster is "HEALTH_OK" is that the monitor fails to be notified
that the osd in question is not up in "heatbeat_interval". Because infernalis
does not have the osd_fast_fail_on_connection_refused support, the monitor
needs longer to detect that an osd is down, and osd_heartbeat_grace is used to
determine if an osd is down.

References: http://tracker.ceph.com/issues/16239
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agorgw: fix crash when listing objects via swift 14661/head
Yehuda Sadeh [Wed, 8 Mar 2017 22:52:34 +0000 (14:52 -0800)]
rgw: fix crash when listing objects via swift

Fixes: http://tracker.ceph.com/issues/19249
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit a9ec5e8ce184e19c009863db4d3519f9d8af91bd)

Conflicts:
        src/rgw/rgw_rest_swift.cc ("key" element of RGWObjEnt struct
           is not a reference; fix)

(cherry picked from commit 92b35155ff7b7492f3c50bf4f2ff0ffef2ca1c55)

8 years agoMerge pull request #14752 from cbodley/wip-19474
Nathan Cutler [Mon, 19 Jun 2017 20:46:47 +0000 (22:46 +0200)]
Merge pull request #14752 from cbodley/wip-19474

jewel: rgw: allow system users to read SLO parts

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoclient: update the 'approaching max_size' code 15472/head
Yan, Zheng [Fri, 19 May 2017 01:37:15 +0000 (09:37 +0800)]
client: update the 'approaching max_size' code

The old 'approaching max_size' code expects MDS set max_size to
'2 x reported_size'. This is no longer true. The new code reports
file size when half of previous max_size increment has been used.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 9316b0442c6f828dcf8da952e4c7a63c4db1398d)

Conflicts:
        src/client/Client.cc - in jewel, second argument to check_caps() is
            a bool (see 0df562a8e13 which is not in jewel)

8 years agomds: limit client writable range increment
Yan, Zheng [Wed, 17 May 2017 11:08:37 +0000 (19:08 +0800)]
mds: limit client writable range increment

For very large file, setting the writable range to '2 * file_size'
causes file recovery to run a long time. To recover a 1T file, Filer
needs to probe 2T~1T range.

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

Conflicts:
        src/mds/Locker.h - in jewel, file_update_finish() has different
            arguments than it does in master

8 years agoosdc/Journaler: avoid executing on_safe contexts prematurely 15468/head
Yan, Zheng [Tue, 23 May 2017 13:46:54 +0000 (21:46 +0800)]
osdc/Journaler: avoid executing on_safe contexts prematurely

Journaler::_do_flush() can skip flushing some data when prezered
journal space isn't enough. Before updating Journaler::next_safe_pos,
we need to check if Journaler::_do_flush() has flushed enough data.

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

8 years agoosdc/Journaler: make header write_pos align to boundary of flushed entry
Yan, Zheng [Wed, 12 Apr 2017 08:00:18 +0000 (16:00 +0800)]
osdc/Journaler: make header write_pos align to boundary of flushed entry

This can speed up the process that detects and drops partial written
entry in the log tail.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 8ae2962b79903e217fda83cea4140af64b5d6883)

Conflicts:
src/osdc/Journaler.cc - 8d4f6b92cba is not being backported to jewel
src/osdc/Journaler.h - Journaler::Journaler initializer list is different in jewel, compared to master

8 years agoMerge pull request #14672 from smithfarm/wip-19334-jewel
John Spray [Wed, 14 Jun 2017 14:01:27 +0000 (10:01 -0400)]
Merge pull request #14672 from smithfarm/wip-19334-jewel

jewel: MDS heartbeat timeout during rejoin, when working with large amount of caps/inodes

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agopybind: fix cephfs.OSError initialization 15000/head
Yan, Zheng [Fri, 12 May 2017 02:38:51 +0000 (10:38 +0800)]
pybind: fix cephfs.OSError initialization

Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "cephfs.pyx", line 672, in cephfs.LibCephFS.open (/home/zhyan/Ceph/ceph-2/build/src/pybind/cephfs/pyrex/cephfs.c:10160)
  File "cephfs.pyx", line 155, in cephfs.OSError.__init__ (/home/zhyan/Ceph/ceph-2/build/src/pybind/cephfs/pyrex/cephfs.c:1889)
TypeError: __init__() takes exactly 3 positional arguments (2 given)

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit e6493f64ba4592b8dca54ece4464efa6c7f331a7)

8 years agopybind: fix open flags calculation
Yan, Zheng [Wed, 10 May 2017 00:13:52 +0000 (08:13 +0800)]
pybind: fix open flags calculation

(O_WRONLY | O_RDWR) is invaild open flags

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

8 years agoMerge pull request #14677 from smithfarm/wip-19665-jewel
John Spray [Wed, 14 Jun 2017 13:43:05 +0000 (09:43 -0400)]
Merge pull request #14677 from smithfarm/wip-19665-jewel

jewel: mds: C_MDSInternalNoop::complete doesn't free itself

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #15466 from smithfarm/wip-19762-jewel
John Spray [Wed, 14 Jun 2017 13:35:08 +0000 (09:35 -0400)]
Merge pull request #15466 from smithfarm/wip-19762-jewel

jewel: cephfs: non-local quota changes not visible until some IO is done

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14700 from smithfarm/wip-19709-jewel
John Spray [Wed, 14 Jun 2017 13:32:47 +0000 (09:32 -0400)]
Merge pull request #14700 from smithfarm/wip-19709-jewel

jewel: mds: enable start when session ino info is corrupt

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14685 from smithfarm/wip-19675-jewel
John Spray [Wed, 14 Jun 2017 13:31:22 +0000 (09:31 -0400)]
Merge pull request #14685 from smithfarm/wip-19675-jewel

jewel: cephfs: Test failure: test_data_isolated (tasks.cephfs.test_volume_client.TestVolumeClient)

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14684 from smithfarm/wip-19673-jewel
John Spray [Wed, 14 Jun 2017 13:30:53 +0000 (09:30 -0400)]
Merge pull request #14684 from smithfarm/wip-19673-jewel

jewel: cephfs: mds is crushed, after I set about 400 64KB xattr kv pairs to a file

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14683 from smithfarm/wip-19671-jewel
John Spray [Wed, 14 Jun 2017 13:30:13 +0000 (09:30 -0400)]
Merge pull request #14683 from smithfarm/wip-19671-jewel

jewel: cephfs: MDS assert failed when shutting down

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14682 from smithfarm/wip-19668-jewel
John Spray [Wed, 14 Jun 2017 13:29:50 +0000 (09:29 -0400)]
Merge pull request #14682 from smithfarm/wip-19668-jewel

jewel: cephfs: MDS goes readonly writing backtrace for a file whose data pool has been removed

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14679 from smithfarm/wip-19666-jewel
John Spray [Wed, 14 Jun 2017 13:27:13 +0000 (09:27 -0400)]
Merge pull request #14679 from smithfarm/wip-19666-jewel

jewel: cephfs: The mount point break off when mds switch hanppened.

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14676 from smithfarm/wip-19619-jewel
John Spray [Wed, 14 Jun 2017 13:26:40 +0000 (09:26 -0400)]
Merge pull request #14676 from smithfarm/wip-19619-jewel

jewel: cephfs: MDS server crashes due to inconsistent metadata.

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14674 from smithfarm/wip-19482-jewel
John Spray [Wed, 14 Jun 2017 13:24:38 +0000 (09:24 -0400)]
Merge pull request #14674 from smithfarm/wip-19482-jewel

jewel: cephfs: No output for ceph mds rmfailed 0 --yes-i-really-mean-it command

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14671 from smithfarm/wip-19044-jewel
John Spray [Wed, 14 Jun 2017 13:23:27 +0000 (09:23 -0400)]
Merge pull request #14671 from smithfarm/wip-19044-jewel

jewel: tests: buffer overflow in test LibCephFS.DirLs

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14670 from smithfarm/wip-18949-jewel
John Spray [Wed, 14 Jun 2017 13:23:13 +0000 (09:23 -0400)]
Merge pull request #14670 from smithfarm/wip-18949-jewel

jewel: mds: avoid reusing deleted inode in StrayManager::_purge_stray_logged

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14669 from smithfarm/wip-18900-jewel
John Spray [Wed, 14 Jun 2017 13:22:28 +0000 (09:22 -0400)]
Merge pull request #14669 from smithfarm/wip-18900-jewel

jewel: cephfs: Test failure: test_open_inode

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14668 from smithfarm/wip-18705-jewel
John Spray [Wed, 14 Jun 2017 13:21:43 +0000 (09:21 -0400)]
Merge pull request #14668 from smithfarm/wip-18705-jewel

jewel: mds: fragment space check can cause replayed request fail

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14698 from smithfarm/wip-19677-jewel
John Spray [Tue, 13 Jun 2017 18:05:55 +0000 (19:05 +0100)]
Merge pull request #14698 from smithfarm/wip-19677-jewel

jewel: cephfs: ceph-fuse does not recover after lost connection to MDS

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14766 from smithfarm/wip-19757-jewel
Abhishek L [Fri, 9 Jun 2017 17:39:17 +0000 (19:39 +0200)]
Merge pull request #14766 from smithfarm/wip-19757-jewel

jewel: rgw: fix failed to create bucket if a non-master zonegroup has a single zone

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #14787 from linuxbox2/jewel-rgw-shard-limit-ck
Abhishek L [Fri, 9 Jun 2017 17:38:46 +0000 (19:38 +0200)]
Merge pull request #14787 from linuxbox2/jewel-rgw-shard-limit-ck

jewel: rgw: add bucket size limit check to radosgw-admin

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #14789 from mdw-at-linuxbox/wip-jewel-rgw-rvk
Abhishek L [Fri, 9 Jun 2017 17:38:23 +0000 (19:38 +0200)]
Merge pull request #14789 from mdw-at-linuxbox/wip-jewel-rgw-rvk

jewel: rgw: swift: disable revocation thread if sleep == 0 || cache_size == 0

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #14815 from smithfarm/wip-19786-jewel
Abhishek L [Fri, 9 Jun 2017 17:36:02 +0000 (19:36 +0200)]
Merge pull request #14815 from smithfarm/wip-19786-jewel

jewel: rgw: failure to create s3 type subuser from admin rest api

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #15312 from theanalyst/wip-20078
Nathan Cutler [Wed, 7 Jun 2017 18:13:15 +0000 (20:13 +0200)]
Merge pull request #15312 from theanalyst/wip-20078

jewel: rgw: only append zonegroups to rest params if not empty

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #15382 from theanalyst/wip-mem-leak2
Nathan Cutler [Wed, 7 Jun 2017 11:48:06 +0000 (13:48 +0200)]
Merge pull request #15382 from theanalyst/wip-mem-leak2

jewel: rgw:fix memory leaks in data/md sync

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoosd: Move scrub sleep timer to osdservice 15529/head
Brad Hubbard [Mon, 22 May 2017 03:21:25 +0000 (13:21 +1000)]
osd: Move scrub sleep timer to osdservice

PR 14886 erroneously creates a scrub sleep timer for every pg resulting
in a proliferation of threads. Move the timer to the osd service so
there can be only one.

Fixes: http://tracker.ceph.com/issues/19986
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit f110a82437df79dc20207d296e8229fc0e9ce18b)

Conflicts:
        src/osd/PG.cc - ceph_clock_now requires a CephContext argmunent
        in Jewel

8 years agoosd: Implement asynchronous scrub sleep
Brad Hubbard [Mon, 24 Apr 2017 04:10:47 +0000 (14:10 +1000)]
osd: Implement asynchronous scrub sleep

Rather than blocking the main op queue just do an async sleep.

Fixes: http://tracker.ceph.com/issues/19497
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit 7af3e86c2e4992db35637864b83832535c94d0e6)

8 years agoClient.cc: adjust Client::_getattr calls 15466/head
Nathan Cutler [Sun, 4 Jun 2017 18:39:58 +0000 (20:39 +0200)]
Client.cc: adjust Client::_getattr calls

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agoqa/cephfs: use getfattr/setfattr helpers
John Spray [Wed, 15 Mar 2017 19:36:08 +0000 (19:36 +0000)]
qa/cephfs: use getfattr/setfattr helpers

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit dd43d3bc646aeab88486b0963fc83de0b18800c4)

Conflicts:
        qa/tasks/cephfs/test_data_scan.py: difference in the
            self._mount.run_shell() call in NonDefaultLayout::write (which is
            being dropped by this commit) - in jewel it has "sudo", and in
            master it doesn't

8 years agotasks/cephfs: fix race while mounting
John Spray [Wed, 22 Jun 2016 12:00:44 +0000 (13:00 +0100)]
tasks/cephfs: fix race while mounting

This could fail if the mount hadn't finished
coming up.

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit adfb757c898a80f18c15dafd02e29840c5931c87)

8 years agoqa: add test for reading quotas from different clients
John Spray [Wed, 15 Mar 2017 19:26:30 +0000 (19:26 +0000)]
qa: add test for reading quotas from different clients

Fixes: http://tracker.ceph.com/issues/17939
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 61617f8f10a6322603a9add77980865cd972ef97)

8 years agoclient: _getattr on quota_root before using in statfs
John Spray [Wed, 15 Mar 2017 17:51:44 +0000 (17:51 +0000)]
client: _getattr on quota_root before using in statfs

...so that after someone adjusts the quota settings
on an inode that another client is using as its mount root,
the change is visible immediately on the other client.

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 3d25941aadd223669448d0f5d3c0bd1fefa72308)

8 years agoclient: getattr before read on ceph.* xattrs
John Spray [Wed, 15 Mar 2017 15:32:47 +0000 (15:32 +0000)]
client: getattr before read on ceph.* xattrs

Previously we were returning values for quota, layout
xattrs without any kind of update -- the user just got
whatever happened to be in our cache.

Clearly this extra round trip has a cost, but reads of
these xattrs are fairly rare, happening on admin
intervention rather than in normal operation.

Fixes: http://tracker.ceph.com/issues/17939
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 532dc4b68e538c189ef828f67cecd0d647a62250)

8 years agoMerge pull request #15416 from dzafman/wip-20126
David Zafman [Fri, 2 Jun 2017 16:54:22 +0000 (09:54 -0700)]
Merge pull request #15416 from dzafman/wip-20126

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoosd: Object level shard errors are tracked and used if no auth available 15416/head
David Zafman [Wed, 31 May 2017 22:39:19 +0000 (15:39 -0700)]
osd: Object level shard errors are tracked and used if no auth available

Shards with object mismatch are tracked to mark them inconsistent
Fix test because storing omap_digest in object_info not behaving as before

Fixes: http://tracker.ceph.com/issues/20089
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 1cacbea763c7aabfeaaf4bd5e878301044184117)

Conflicts:
src/test/osd/osd-scrub-repair.sh (no alloc_hint in object_info)

8 years agorgw:fix memory leaks 15382/head
weiqiaomiao [Wed, 1 Jun 2016 09:20:49 +0000 (17:20 +0800)]
rgw:fix memory leaks

Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
(cherry picked from commit 73e5be2b6133cf4caa0e5e5c8c9eae748b785dbf)

8 years agocls/rgw: list_plain_entries() stops before bi_log entries 15383/head
Casey Bodley [Fri, 5 May 2017 18:56:40 +0000 (14:56 -0400)]
cls/rgw: list_plain_entries() stops before bi_log entries

list_plain_entries() was using encode_obj_versioned_data_key() to set
its end_key, which gives a prefix of BI_BUCKET_OBJ_INSTANCE_INDEX[=2]

that range between start_key and end_key would not only span the
BI_BUCKET_OBJS_INDEX[=0] prefixes, but BI_BUCKET_LOG_INDEX[=1] prefixes
as well. this can result in list_plain_entries() trying and failing to
decode a rgw_bi_log_entry as a rgw_bucket_dir_entry

Fixes: http://tracker.ceph.com/issues/19876
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit b29a1633a57abf443d5790c13d680d2917f86037)

8 years agoMerge pull request #15360 from liewegas/wip-jewel-master-mixed
Sage Weil [Tue, 30 May 2017 14:39:47 +0000 (09:39 -0500)]
Merge pull request #15360 from liewegas/wip-jewel-master-mixed

qa/workunits/rados/test-upgrade-*: whitelist tests for master

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoqa/workunits/rados/test-upgrade-*: whitelist tests for master 15360/head
Sage Weil [Tue, 30 May 2017 13:58:09 +0000 (09:58 -0400)]
qa/workunits/rados/test-upgrade-*: whitelist tests for master

The jewel-x upgrade test now runs this script against a mixed cluster on
a machine with code from master installed.  That means we have to skip
any new tests that will fail on a mixed cluster.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15208 from liewegas/wip-sortbitwise-jewel
Nathan Cutler [Sat, 27 May 2017 07:21:44 +0000 (09:21 +0200)]
Merge pull request #15208 from liewegas/wip-sortbitwise-jewel

mon: fix 'sortbitwise' warning on jewel

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #14851 from yehudasa/wip-rgw-support-ragweed-jewel
Nathan Cutler [Sat, 27 May 2017 00:46:55 +0000 (02:46 +0200)]
Merge pull request #14851 from yehudasa/wip-rgw-support-ragweed-jewel

jewel: rgw: add apis to support ragweed suite

Reviewed-by: Nathan Cutler <ncutler@suse.com>
8 years agorgw: rest conn functions cleanup, only append zonegroup if not empty 15312/head
Yehuda Sadeh [Tue, 23 Aug 2016 17:22:42 +0000 (10:22 -0700)]
rgw: rest conn functions cleanup, only append zonegroup if not empty

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

8 years agorgw: rest and http client code to use param vectors
Karol Mroz [Thu, 17 Mar 2016 09:32:14 +0000 (10:32 +0100)]
rgw: rest and http client code to use param vectors

Replaces param/header lists with vectors. In these cases, we're only ever
adding to the back of the list, so a vector should be more efficient.
Also moves param_pair_t/param_vec_t higher up the include chain for
cleaner function signatures.

Signed-off-by: Karol Mroz <kmroz@suse.com>
(cherry picked from commit d4a2527872e0f5c3ae2874bb7d0ff459ae83cfd4)

Conflicts:
src/rgw/rgw_http_client.cc
trivial ws conflict on rebase

8 years agoMerge pull request #14765 from smithfarm/wip-18972-jewel
Alfredo Deza [Thu, 25 May 2017 16:45:30 +0000 (12:45 -0400)]
Merge pull request #14765 from smithfarm/wip-18972-jewel

jewel: ceph-disk does not support cluster names different than 'ceph'

Reviewed-by: Alfredo Deza <adeza@redhat.com>
8 years agoqa/suites/rados/singleton-nomsgr/*: set sortbitwise after upgrade 15208/head
Sage Weil [Wed, 24 May 2017 13:48:11 +0000 (09:48 -0400)]
qa/suites/rados/singleton-nomsgr/*: set sortbitwise after upgrade

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon/OSDMonitor: fixup sortbitwise flag warning
huanwen ren [Tue, 27 Dec 2016 10:54:45 +0000 (10:54 +0000)]
mon/OSDMonitor: fixup sortbitwise flag warning

"ceph -s" does not report warning when using
command "ceph osd unset sortbitwise" to drop
sortbitwise flag.
we should use "osdmap.get_up_osd_features() &
CEPH_FEATURE_OSD_BITWISE_HOBJ_SORT"
instead of "(osdmap.get_features(CEPH_ENTITY_TYPE_OSD, NULL) &
CEPH_FEATURE_OSD_BITWISE_HOBJ_SORT)",
because osdmap.get_features only get local "features"

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
(cherry picked from commit c25ee187e28724846d0011cd8145e16956d3636e)

8 years agomon: remove config option to disable no sortbitwise warning
Sage Weil [Tue, 1 Nov 2016 16:09:57 +0000 (12:09 -0400)]
mon: remove config option to disable no sortbitwise warning

We'll require this soon.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 04e3319e8aecde9ca58ccb7c89016f9079c7d657)

8 years agoMerge pull request #13450 from dreamhost/wip-18887-jewel
Nathan Cutler [Wed, 17 May 2017 07:29:21 +0000 (09:29 +0200)]
Merge pull request #13450 from dreamhost/wip-18887-jewel

jewel: msg: IPv6 Heartbeat packets are not marked with DSCP QoS - simple messenger

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agofs: normalize file open flags internally used by cephfs
Jan Fajerski [Thu, 20 Apr 2017 16:38:43 +0000 (18:38 +0200)]
fs: normalize file open flags internally used by cephfs

The file open flags (O_foo) are platform specific. Normalize these flags
before they are send to the MDS. For processing of client messages the
MDS should only compare to these normalized flags.
Otherwise this can lead to bogus flags getting transmitted on ppc64.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 88d2da5e93198e69435e288ce00d216d5fe27f80)

Conflicts:
src/client/Client.cc
          Conflicts can be resolved by choosing changes from HEAD and
          adding a call to ceph_flags_sys2wire where flags are logged.
src/mds/Server.cc
          Conflicts can be resolved by choosing changes from HEAD and
          while making sure that the MDS compares request O_ flags the
          the CEPH_O_ flags, since all wire O_ flags are normalized.

8 years agomsg/simple/Pipe: manual backport of fix in PR#14795 13450/head
Robin H. Johnson [Thu, 4 May 2017 05:31:40 +0000 (22:31 -0700)]
msg/simple/Pipe: manual backport of fix in PR#14795

Manual backport of errno fixup from PR#14795
(6f1037e22c2a304795895498cdc955e0ef80f8e3), as noted by
https://github.com/ceph/ceph/pull/13450#discussion_r114696885.

Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
8 years agoMerge pull request #14667 from smithfarm/wip-18699-jewel
Nathan Cutler [Wed, 3 May 2017 11:04:27 +0000 (13:04 +0200)]
Merge pull request #14667 from smithfarm/wip-18699-jewel

jewel: client: fix the cross-quota rename boundary check conditions

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #14332 from shinobu-x/wip-19396-jewel
Nathan Cutler [Wed, 3 May 2017 08:33:24 +0000 (10:33 +0200)]
Merge pull request #14332 from shinobu-x/wip-19396-jewel

 jewel: Objecter::epoch_barrier isn't respected in _op_submit()

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #14204 from dzafman/wip-18533-jewel
Nathan Cutler [Wed, 3 May 2017 08:32:37 +0000 (10:32 +0200)]
Merge pull request #14204 from dzafman/wip-18533-jewel

jewel: core: two instances of omap_digest mismatch

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #13884 from shinobu-x/wip-19119-jewel
Nathan Cutler [Wed, 3 May 2017 08:31:38 +0000 (10:31 +0200)]
Merge pull request #13884 from shinobu-x/wip-19119-jewel

jewel: pre-jewel "osd rm" incrementals are misinterpreted

Reviewed-by: Josh Durgin <jdurgin@redhat.com>