]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agoclient: fix the cross-quota rename boundary check conditions 14667/head
Greg Farnum [Wed, 14 Dec 2016 20:09:44 +0000 (12:09 -0800)]
client: fix the cross-quota rename boundary check conditions

We were previously rejecting a rename if either of the involved directories
was a quota root, even if the other directory was part of the same quota
"tree". What we really want to do is identify the correct quota root
(whether local or ancestral) for each directory and compare them. So
now we do.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 8e8892aa46accb519faa4bb9fecf66618f1b11b2)

Conflicts:
        src/client/Client.cc (do not pass perm to get_quota_root() because
        jewel does not have 3caa4d233633fb7a67747f2c79c4a0ab89112294)

8 years agoMerge pull request #14383 from smithfarm/wip-19547-jewel
Nathan Cutler [Thu, 20 Apr 2017 09:08:45 +0000 (11:08 +0200)]
Merge pull request #14383 from smithfarm/wip-19547-jewel

jewel: build/ops: rbdmap.service not included in debian packaging (jewel-only)

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
8 years agoMerge pull request #14143 from smithfarm/wip-19355-jewel
Nathan Cutler [Thu, 20 Apr 2017 09:02:39 +0000 (11:02 +0200)]
Merge pull request #14143 from smithfarm/wip-19355-jewel

jewel: rgw: when converting region_map we need to use rgw_zone_root_pool

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #14136 from smithfarm/wip-19330-jewel
Nathan Cutler [Thu, 20 Apr 2017 09:01:49 +0000 (11:01 +0200)]
Merge pull request #14136 from smithfarm/wip-19330-jewel

jewel: rgw: upgrade to multisite v2 fails if there is a zone without zone info

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #13872 from smithfarm/wip-19163-jewel
Nathan Cutler [Thu, 20 Apr 2017 09:00:35 +0000 (11:00 +0200)]
Merge pull request #13872 from smithfarm/wip-19163-jewel

jewel: doc: radosgw-admin: add the 'object stat' command to usage

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #13863 from smithfarm/wip-19155-jewel
Nathan Cutler [Thu, 20 Apr 2017 08:59:33 +0000 (10:59 +0200)]
Merge pull request #13863 from smithfarm/wip-19155-jewel

jewel: rgw: typo in rgw_admin.cc

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #13779 from smithfarm/wip-18866-jewel
Nathan Cutler [Thu, 20 Apr 2017 08:56:35 +0000 (10:56 +0200)]
Merge pull request #13779 from smithfarm/wip-18866-jewel

jewel: rgw: 'radosgw-admin sync status' on master zone of non-master zonegroup

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #14596 from gregsfortytwo/wip-17916-divergent
Gregory Farnum [Wed, 19 Apr 2017 06:47:27 +0000 (02:47 -0400)]
Merge pull request #14596 from gregsfortytwo/wip-17916-divergent

Wip 17916 divergent

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agopglog: require users set a config option before ignoring divergent_priors 14596/head
Greg Farnum [Tue, 18 Apr 2017 01:09:55 +0000 (18:09 -0700)]
pglog: require users set a config option before ignoring divergent_priors

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agoosd: pglog: clean up divergent_priors off disk when running; don't assert on startup
Greg Farnum [Fri, 7 Apr 2017 21:33:20 +0000 (14:33 -0700)]
osd: pglog: clean up divergent_priors off disk when running; don't assert on startup

Fixes: http://tracker.ceph.com/issues/17916
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #14492 from gregsfortytwo/wip-jewel-snaptrim
Gregory Farnum [Mon, 17 Apr 2017 21:41:19 +0000 (17:41 -0400)]
Merge pull request #14492 from gregsfortytwo/wip-jewel-snaptrim

Backport snap trimming improvements to Jewel

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge branch 'jewel' into wip-jewel-snaptrim 14492/head
Gregory Farnum [Mon, 17 Apr 2017 21:39:59 +0000 (17:39 -0400)]
Merge branch 'jewel' into wip-jewel-snaptrim

8 years agoPendingReleaseNotes: discuss snap trim improvements
Greg Farnum [Mon, 17 Apr 2017 21:32:38 +0000 (14:32 -0700)]
PendingReleaseNotes: discuss snap trim improvements

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agoPrimaryLogPG: reimplement osd_snap_trim_sleep within the state machine
Greg Farnum [Wed, 12 Apr 2017 23:30:55 +0000 (16:30 -0700)]
PrimaryLogPG: reimplement osd_snap_trim_sleep within the state machine

Rather than blocking the main op queue, just pause for that amount of
time between state machine cycles.

Also, add osd_snap_trim_sleep to a few of the thrasher yamls.

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 2ed7759cfeb03e71f0fbd98fe7c2db2bb741861c)

Conflicts:
src/osd/PrimaryLogPG.cc

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 67336454a4cee66522bc0ca01b2c58b8960f75ec)

Conflicts:
qa/suites/rados/thrash/thrashers/default.yaml
qa/suites/rados/thrash/thrashers/pggrow.yaml
src/osd/OSD.h
src/osd/ReplicatedPG.cc
src/osd/ReplicatedPG.h

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agorados: check that pool is done trimming before removing it
Samuel Just [Thu, 26 Jan 2017 23:41:21 +0000 (15:41 -0800)]
rados: check that pool is done trimming before removing it

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 4aebf59d906fa3e03d21bdac182f89fe3cd4c802)
(cherry picked from commit 34398c29b3c57f00d932cf96570f882dce64a82b)

8 years agoosd/ReplicatedPG: limit the number of concurrently trimming pgs
Greg Farnum [Tue, 11 Apr 2017 21:04:19 +0000 (14:04 -0700)]
osd/ReplicatedPG: limit the number of concurrently trimming pgs

This patch introduces an AsyncReserver for snap trimming to limit the
number of pgs on any single OSD which can be trimming, as with backfill.
Unlike backfill, we don't take remote reservations on the assumption
that the set of pgs with trimming work to do is already well
distributed, so it doesn't seem worth the implementation overhead to get
reservations from the peers as well.

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 21cc515adfb225ba70f1d80b1b76f0345c214c22)

Conflicts:
src/osd/PrimaryLogPG.cc
src/osd/PrimaryLogPG.h

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 68ea24396ca6450d4d8042a7c5f51306b7d199fa)
(cherry picked from commit c7176b869898c870b56b1762958652d801af4c4c)

Conflicts: Many. As evidenced by involving two distinct patches
in this one commit, it wasn't a clean backport.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #13834 from smithfarm/wip-18969-jewel
Nathan Cutler [Fri, 14 Apr 2017 20:28:51 +0000 (22:28 +0200)]
Merge pull request #13834 from smithfarm/wip-18969-jewel

jewel: rgw: Change loglevel to 20 for 'System already converted' message

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #13833 from smithfarm/wip-18908-jewel
Nathan Cutler [Fri, 14 Apr 2017 20:26:51 +0000 (22:26 +0200)]
Merge pull request #13833 from smithfarm/wip-18908-jewel

jewel: rgw: the swift container acl does not support field .ref

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
8 years agoMerge pull request #13214 from ovh/bp-osd-updateable-throttles-jewel
Nathan Cutler [Thu, 13 Apr 2017 09:09:27 +0000 (11:09 +0200)]
Merge pull request #13214 from ovh/bp-osd-updateable-throttles-jewel

jewel: osd: allow client throttler to be adjusted on-fly, without restart

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #14326 from shinobu-x/wip-15025-jewel
Nathan Cutler [Thu, 13 Apr 2017 08:44:23 +0000 (10:44 +0200)]
Merge pull request #14326 from shinobu-x/wip-15025-jewel

jewel: osd: new added OSD always down when full flag is set

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #13874 from smithfarm/wip-19171-jewel
Nathan Cutler [Wed, 12 Apr 2017 09:38:48 +0000 (11:38 +0200)]
Merge pull request #13874 from smithfarm/wip-19171-jewel

jewel: doc: rgw S3 create bucket should not do response in json

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
8 years agoMerge pull request #13492 from shinobu-x/wip-18516-jewel
Nathan Cutler [Wed, 12 Apr 2017 09:06:40 +0000 (11:06 +0200)]
Merge pull request #13492 from shinobu-x/wip-18516-jewel

jewel: build/ops: "osd marked itself down" will not recognised if host runs mon + osd on shutdown/reboot

Reviewed-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #13254 from shinobu-x/wip-14609-jewel
Nathan Cutler [Wed, 12 Apr 2017 09:01:23 +0000 (11:01 +0200)]
Merge pull request #13254 from shinobu-x/wip-14609-jewel

jewel: common: radosstriper: protect aio_write API from calls with 0 bytes

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #13489 from shinobu-x/wip-18955-jewel
Nathan Cutler [Wed, 12 Apr 2017 08:52:10 +0000 (10:52 +0200)]
Merge pull request #13489 from shinobu-x/wip-18955-jewel

jewel: ceph-disk: bluestore --setgroup incorrectly set with user

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #14070 from smithfarm/wip-19339-jewel
Nathan Cutler [Wed, 12 Apr 2017 08:51:42 +0000 (10:51 +0200)]
Merge pull request #14070 from smithfarm/wip-19339-jewel

jewel: tests: dummy suite fails in OpenStack

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #14329 from smithfarm/wip-19493-jewel
Nathan Cutler [Wed, 12 Apr 2017 08:51:12 +0000 (10:51 +0200)]
Merge pull request #14329 from smithfarm/wip-19493-jewel

jewel: ceph-disk: Racing between partition creation & device node creation

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #14427 from smithfarm/wip-19140-jewel
Nathan Cutler [Wed, 12 Apr 2017 08:48:29 +0000 (10:48 +0200)]
Merge pull request #14427 from smithfarm/wip-19140-jewel

jewel: osdc/Objecter: If osd full, it should pause read op which w/ rwordered flag

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14324 from shinobu-x/wip-19371-jewel
Nathan Cutler [Wed, 12 Apr 2017 08:48:08 +0000 (10:48 +0200)]
Merge pull request #14324 from shinobu-x/wip-19371-jewel

jewel: common: monitor creation with IPv6 public network segfaults

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14112 from shinobu-x/wip-19192-jewel
Nathan Cutler [Wed, 12 Apr 2017 08:45:35 +0000 (10:45 +0200)]
Merge pull request #14112 from shinobu-x/wip-19192-jewel

jewel: tools: brag fails to count "in" mds

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14150 from smithfarm/wip-18823-jewel
Nathan Cutler [Wed, 12 Apr 2017 08:45:11 +0000 (10:45 +0200)]
Merge pull request #14150 from smithfarm/wip-18823-jewel

jewel: tests: run-rbd-unit-tests.sh assert in lockdep_will_lock, TestLibRBD.ObjectMapConsistentSnap

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14152 from smithfarm/wip-18893-jewel
Nathan Cutler [Wed, 12 Apr 2017 08:44:47 +0000 (10:44 +0200)]
Merge pull request #14152 from smithfarm/wip-18893-jewel

jewel: librbd: Incomplete declaration for ContextWQ in librbd/Journal.h

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14154 from smithfarm/wip-18948-jewel
Nathan Cutler [Wed, 12 Apr 2017 08:44:25 +0000 (10:44 +0200)]
Merge pull request #14154 from smithfarm/wip-18948-jewel

jewel: tests: additional rbd-mirror test stability improvements

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14148 from smithfarm/wip-18778-jewel
Nathan Cutler [Wed, 12 Apr 2017 08:44:04 +0000 (10:44 +0200)]
Merge pull request #14148 from smithfarm/wip-18778-jewel

jewel: rbd: rbd --pool=x rename y z does not work

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14083 from smithfarm/wip-19357-jewel
Nathan Cutler [Wed, 12 Apr 2017 08:43:41 +0000 (10:43 +0200)]
Merge pull request #14083 from smithfarm/wip-19357-jewel

jewel: rbd: systemctl stop rbdmap unmaps all rbds and not just the ones in /etc/ceph/rbdmap

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #13154 from smithfarm/wip-18496-jewel
Nathan Cutler [Wed, 12 Apr 2017 08:43:21 +0000 (10:43 +0200)]
Merge pull request #13154 from smithfarm/wip-18496-jewel

jewel: librbd: Possible deadlock performing a synchronous API action while refresh in-progress

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #13244 from smithfarm/wip-18775-jewel
Nathan Cutler [Wed, 12 Apr 2017 08:42:54 +0000 (10:42 +0200)]
Merge pull request #13244 from smithfarm/wip-18775-jewel

jewel: rbd: qemu crash triggered by network issues

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #13809 from asheplyakov/18321-bp-jewel
Nathan Cutler [Wed, 12 Apr 2017 08:42:23 +0000 (10:42 +0200)]
Merge pull request #13809 from asheplyakov/18321-bp-jewel

jewel: librbd: remove image header lock assertions

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #13107 from smithfarm/wip-18669-jewel
Nathan Cutler [Wed, 12 Apr 2017 08:41:56 +0000 (10:41 +0200)]
Merge pull request #13107 from smithfarm/wip-18669-jewel

jewel: tests: [  FAILED  ] TestLibRBD.ImagePollIO in upgrade:client-upgrade-kraken-distro-basic-smithi

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #13585 from asheplyakov/jewel-bp-16585
Nathan Cutler [Wed, 12 Apr 2017 08:39:26 +0000 (10:39 +0200)]
Merge pull request #13585 from asheplyakov/jewel-bp-16585

jewel: msg: set close on exec flag

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14371 from tchaikov/wip-19429-jewel
Nathan Cutler [Wed, 12 Apr 2017 01:56:22 +0000 (03:56 +0200)]
Merge pull request #14371 from tchaikov/wip-19429-jewel

jewel: tests: clone workunit using the branch specified by task

Nathan Cutler <ncutler@suse.com>

8 years agoMerge pull request #14325 from shinobu-x/wip-18619-jewel
Nathan Cutler [Wed, 12 Apr 2017 01:54:11 +0000 (03:54 +0200)]
Merge pull request #14325 from shinobu-x/wip-18619-jewel

jewel: osd: degraded and misplaced status output inaccurate

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #14236 from smithfarm/wip-19392-jewel
Nathan Cutler [Wed, 12 Apr 2017 01:53:25 +0000 (03:53 +0200)]
Merge pull request #14236 from smithfarm/wip-19392-jewel

jewel: mon: remove bad rocksdb option

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #14181 from mslovy/wip-19394-jewel
Nathan Cutler [Wed, 12 Apr 2017 01:52:41 +0000 (03:52 +0200)]
Merge pull request #14181 from mslovy/wip-19394-jewel

jewel: osd: bypass readonly ops when osd full

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #14113 from shinobu-x/wip-19319-jewel
Nathan Cutler [Wed, 12 Apr 2017 01:49:49 +0000 (03:49 +0200)]
Merge pull request #14113 from shinobu-x/wip-19319-jewel

 jewel: cli: RadosImport::import should return an error if Rados::connect fails

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
8 years agoMerge pull request #14047 from asheplyakov/reindex-on-pg-split
Nathan Cutler [Wed, 12 Apr 2017 01:45:33 +0000 (03:45 +0200)]
Merge pull request #14047 from asheplyakov/reindex-on-pg-split

jewel: osd: reindex properly on pg log split

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #14044 from mslovy/wip-19311-jewel
Nathan Cutler [Wed, 12 Apr 2017 01:45:15 +0000 (03:45 +0200)]
Merge pull request #14044 from mslovy/wip-19311-jewel

jewel: core: os/filestore: fix clang static check warn use-after-free

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #13932 from asheplyakov/18911-bp-jewel
Nathan Cutler [Wed, 12 Apr 2017 01:44:25 +0000 (03:44 +0200)]
Merge pull request #13932 from asheplyakov/18911-bp-jewel

jewel: rbd-nbd: check /sys/block/nbdX/size to ensure kernel mapped correctly

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #13831 from jan--f/wip-19206-jewel
Nathan Cutler [Wed, 12 Apr 2017 01:42:13 +0000 (03:42 +0200)]
Merge pull request #13831 from jan--f/wip-19206-jewel

jewel: fs: Invalid error code returned by MDS is causing a kernel client WARNING

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #13827 from tchaikov/wip-19185-jewel
Nathan Cutler [Wed, 12 Apr 2017 01:41:36 +0000 (03:41 +0200)]
Merge pull request #13827 from tchaikov/wip-19185-jewel

jewel: osd: ReplicatedPG: try with pool's use-gmt setting if hitset archive not found

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #13788 from shinobu-x/wip-18235-jewel
Nathan Cutler [Wed, 12 Apr 2017 01:40:09 +0000 (03:40 +0200)]
Merge pull request #13788 from shinobu-x/wip-18235-jewel

jewel: core: os/filestore/HashIndex: be loud about splits

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #13786 from shinobu-x/wip-19129-jewel
Nathan Cutler [Wed, 12 Apr 2017 01:39:27 +0000 (03:39 +0200)]
Merge pull request #13786 from shinobu-x/wip-19129-jewel

jewel: build/ops: ceph-base package missing dependency for psmisc

Reviewed-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #13732 from liewegas/wip-19119-jewel
Nathan Cutler [Wed, 12 Apr 2017 01:38:34 +0000 (03:38 +0200)]
Merge pull request #13732 from liewegas/wip-19119-jewel

jewel: doc: PendingReleaseNotes: note about 19119

Reviewed-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #13541 from shinobu-x/wip-18929-jewel
Nathan Cutler [Wed, 12 Apr 2017 01:36:21 +0000 (03:36 +0200)]
Merge pull request #13541 from shinobu-x/wip-18929-jewel

 jewel: osd: restrict want_acting to up+acting on recovery completion

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #13477 from asheplyakov/jewel-bp-18951
Nathan Cutler [Wed, 12 Apr 2017 01:34:54 +0000 (03:34 +0200)]
Merge pull request #13477 from asheplyakov/jewel-bp-18951

jewel: osd: --flush-journal: sporadic segfaults on exit

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #13261 from shinobu-x/wip-18587-jewel
Nathan Cutler [Wed, 12 Apr 2017 01:33:25 +0000 (03:33 +0200)]
Merge pull request #13261 from shinobu-x/wip-18587-jewel

jewel: mon: OSDMonitor: make 'osd crush move ...' work on osds

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
8 years ago10.2.7 v10.2.7
Jenkins Build Slave User [Mon, 10 Apr 2017 11:43:44 +0000 (11:43 +0000)]
10.2.7

8 years agoosdc/Objecter: resend RWORDERED ops on full 14427/head
Sage Weil [Fri, 3 Mar 2017 03:20:08 +0000 (21:20 -0600)]
osdc/Objecter: resend RWORDERED ops on full

Our condition for respecting the FULL flag is complex, and involves
the WRITE | RWORDERED flags vs the FULL_FORCE | FULL_TRY flags.  Previously,
we could block a read bc of RWORDRED but not resend it later.

Fix by capturing the complex condition in a respects_full() bool and using
it both for the blocking-on-send and resending-on-possibly-notfull-later
checks.

Fixes: http://tracker.ceph.com/issues/19133
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit c4b73f19a7be13ff412eef804efcd8c18ed4dae6)

8 years agoosdc/Objecter: If osd full, it should pause read op which w/ rwordered flag.
Jianpeng Ma [Thu, 5 May 2016 15:44:57 +0000 (23:44 +0800)]
osdc/Objecter: If osd full, it should pause read op which w/ rwordered flag.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit 07b2a22210e26eac1b2825c30629788da05e5e12)

8 years agodebian: replace SysV rbdmap with systemd service 14383/head
Ken Dreyer [Tue, 16 Feb 2016 19:56:34 +0000 (12:56 -0700)]
debian: replace SysV rbdmap with systemd service

Stop shipping /etc/init.d/rbdmap in the Debian packages. Ship the
rbdmap.service systemd unit file instead.

The corresponding change has already been made for RPMs, in
9224ac2ad25f7d017916f58b642c0ea25305c3e5.

For Upstart-based systems (eg Ubuntu Trusty), the Debian packages
already contain rbdmap.conf.

(This gets us a tiny bit closer to being able to remove the rbdmap SysV
script from our tree entirely.)

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 839807118dda2fb4d57ed9d50ec46e3ee0e2820a)

Conflicts:
    debian/ceph-common.install (retain /etc/init.d/rbdmap so jewel users can choose sysvinit or systemd)
    debian/rules (retain /etc/init.d/rbdmap so jewel users can choose sysvinit or systemd)

8 years agoqa/tasks/workunit.py: use "overrides" as the default settings of workunit 14371/head
Kefu Chai [Sat, 1 Apr 2017 15:04:22 +0000 (23:04 +0800)]
qa/tasks/workunit.py: use "overrides" as the default settings of workunit

otherwise the settings in "workunit" tasks are always overridden by the
settings in template config. so we'd better follow the way of how
"install" task updates itself with the "overrides" settings: it uses the
"overrides" as the *defaults*.

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

8 years agotasks/workunit.py: specify the branch name when cloning a branch
Kefu Chai [Thu, 30 Mar 2017 04:37:01 +0000 (12:37 +0800)]
tasks/workunit.py: specify the branch name when cloning a branch

c1309fb failed to specify a branch when cloning using --depth=1, which
by default clones the HEAD. and we can not "git checkout" a specific
sha1 if it is not HEAD, after cloning using '--depth=1', so in this
change, we dispatch "tag", "branch", "HEAD" using three Refspec classes.

Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit 9ca7ccf5f1739f731da8bf31260594aea3a2932d)

Conflicts:
qa/tasks/workunit.py (trivial resolution)

8 years agotasks/workunit.py: when cloning, use --depth=1
Dan Mick [Wed, 29 Mar 2017 03:08:13 +0000 (20:08 -0700)]
tasks/workunit.py: when cloning, use --depth=1

Help avoid killing git.ceph.com.  A depth 1 clone takes about
7 seconds, whereas a full one takes about 3:40 (much of it
waiting for the server to create a huge compressed pack)

Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit c1309fbef300a062138ac40eb5d3e5081b833072)

8 years agoPendingReleaseNotes: warning about 'osd rm ...' and #19119 13732/head
Sage Weil [Wed, 1 Mar 2017 19:18:44 +0000 (13:18 -0600)]
PendingReleaseNotes: warning about 'osd rm ...' and #19119

See http://tracker.ceph.com/issues/19119

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

8 years agoceph-disk: Adding retry loop in get_partition_dev() 14329/head
Erwan Velu [Fri, 31 Mar 2017 12:54:33 +0000 (14:54 +0200)]
ceph-disk: Adding retry loop in get_partition_dev()

There is very rare cases where get_partition_dev() is called before the actual partition is available in /sys/block/<device>.

It appear that waiting a very short is usually enough to get the partition beein populated.

Analysis:
update_partition() is supposed to be enough to avoid any racing between events sent by parted/sgdisk/partprobe and
the actual creation on the /sys/block/<device>/* entrypoint.
On our CI that race occurs pretty often but trying to reproduce it locally never been possible.

This patch is almost a workaround rather than a fix to the real problem.
It offer retrying after a very short to be make a chance the device to appear.
This approach have been succesful on the CI.

Note his patch is not changing the timing when the device is perfectly created on time and just differ by a 1/5th up to 2 seconds when the bug occurs.

A typical output from the build running on a CI with that code.
command_check_call: Running command: /usr/bin/udevadm settle --timeout=600
get_dm_uuid: get_dm_uuid /dev/sda uuid path is /sys/dev/block/8:0/dm/uuid
get_partition_dev: Try 1/10 : partition 2 for /dev/sda does not in /sys/block/sda
get_partition_dev: Found partition 2 for /dev/sda after 1 tries
        get_dm_uuid: get_dm_uuid /dev/sda uuid path is /sys/dev/block/8:0/dm/uuid
get_dm_uuid: get_dm_uuid /dev/sda2 uuid path is /sys/dev/block/8:2/dm/uuid

fixes: #19428

Signed-off-by: Erwan Velu <erwan@redhat.com>
(cherry picked from commit 93e7b95ed8b4c78daebf7866bb1f0826d7199075)

8 years agoceph-disk: Reporting /sys directory in get_partition_dev()
Erwan Velu [Wed, 22 Mar 2017 09:11:44 +0000 (10:11 +0100)]
ceph-disk: Reporting /sys directory in get_partition_dev()

When get_partition_dev() fails, it reports the following message :
    ceph_disk.main.Error: Error: partition 2 for /dev/sdb does not appear to exist
The code search for a directory inside the /sys/block/get_dev_name(os.path.realpath(dev)).

The issue here is the error message doesn't report that path when failing while it might be involved in.

This patch is about reporting where the code was looking at when trying to estimate if the partition was available.

Signed-off-by: Erwan Velu <erwan@redhat.com>
(cherry picked from commit 413c9fcfbe8e6ab33d73b8428090ccacc33c5d15)

8 years agoosd: don't share osdmap with objecter when preboot 14326/head
Mingxin Liu [Mon, 13 Mar 2017 15:41:58 +0000 (23:41 +0800)]
osd: don't share osdmap with objecter when preboot

Signed-off-by: Mingxin Liu <mingxin@xsky.com>
(cherry picked from commit a5a3644eecc49b4eea890c6999fe87536495dcbe)

8 years agoosd: Calculate degraded and misplaced more accurately 14325/head
David Zafman [Wed, 18 Jan 2017 16:33:40 +0000 (08:33 -0800)]
osd: Calculate degraded and misplaced more accurately

Calculate num_object_copies based on the larger of pool size,
up set size and acting set size.

Calculate num_objects_degraded as the difference between num_object_copies
and all copies found on acting set and backfilling up set OSDs.

Calculate num_objects_misplaced as all copies on acting set OSDs not in up set
less copies that have been backfilled to up set OSDs.

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

8 years agocommon: fix segfault in public IPv6 addr picking 14324/head
Fabian Grünbichler [Wed, 22 Mar 2017 15:13:50 +0000 (16:13 +0100)]
common: fix segfault in public IPv6 addr picking

sockaddr is only 16 bytes big, so declaring net as sockaddr
and then casting to sockaddr_in6 in case of IPv6 cannot
work.

using sockaddr_storage works for both IPv4 and IPv6, and is
used in other code parts as well.

note that the tests did not find this issue as they declared
the bigger structs and casted the references to (sockaddr *)

Fixes: http://tracker.ceph.com/issues/19371
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
(cherry picked from commit ae2ee3d3835fe25b35eeb1a841ee5234cd69eb65)

8 years agoMerge pull request #14230 from linuxbox2/wip-jewel-expand-argv
Ken Dreyer [Fri, 31 Mar 2017 16:27:07 +0000 (10:27 -0600)]
Merge pull request #14230 from linuxbox2/wip-jewel-expand-argv

jewel: rgw_file: expand argv

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #14233 from ktdreyer/wip-19421-jewel
Ken Dreyer [Fri, 31 Mar 2017 16:17:10 +0000 (10:17 -0600)]
Merge pull request #14233 from ktdreyer/wip-19421-jewel

jewel: librbd: possible race in ExclusiveLock handle_peer_notification

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14231 from linuxbox2/wip-jewel-fhcache
Ken Dreyer [Fri, 31 Mar 2017 16:16:48 +0000 (10:16 -0600)]
Merge pull request #14231 from linuxbox2/wip-jewel-fhcache

jewel: rgw_fh: RGWFileHandle dtor must also cond-unlink from FHCache

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #14215 from mdw-at-linuxbox/wip-jewel-rgw-openssl-fix1
Ken Dreyer [Fri, 31 Mar 2017 16:09:14 +0000 (10:09 -0600)]
Merge pull request #14215 from mdw-at-linuxbox/wip-jewel-rgw-openssl-fix1

rgw: fix openssl

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #14206 from linuxbox2/wip-gui-jewel
Ken Dreyer [Fri, 31 Mar 2017 16:07:48 +0000 (10:07 -0600)]
Merge pull request #14206 from linuxbox2/wip-gui-jewel

jewel: rgw_file: various fixes

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #14205 from linuxbox2/wip-dir-orphan-jewel
Ken Dreyer [Fri, 31 Mar 2017 16:07:03 +0000 (10:07 -0600)]
Merge pull request #14205 from linuxbox2/wip-dir-orphan-jewel

jewel:  rgw_file: wip dir orphan

 Conflicts:
src/rgw/rgw_file.cc (whitespace, trivial resolution)

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #14169 from linuxbox2/wip-18650-jewel
Ken Dreyer [Fri, 31 Mar 2017 16:05:40 +0000 (10:05 -0600)]
Merge pull request #14169 from linuxbox2/wip-18650-jewel

jewel: rgw: rgw_file: FHCache residence check should be exhaustive

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #13869 from smithfarm/wip-19161-jewel
Ken Dreyer [Fri, 31 Mar 2017 16:02:58 +0000 (10:02 -0600)]
Merge pull request #13869 from smithfarm/wip-19161-jewel

jewel: rgw: rgw_file: fix marker computation

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agorgw_file: use fh_hook::is_linked() to check residence 14169/head
Matt Benjamin [Tue, 28 Feb 2017 20:49:06 +0000 (15:49 -0500)]
rgw_file:  use fh_hook::is_linked() to check residence

Previously we assumed that !deleted handles were resident--there
is an observed case where a !deleted handle is !linked.  Since
we currently use safe_link mode, an is_linked() check is
available, and exhaustive.

Fixes: http://tracker.ceph.com/issues/19111
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit c0aa515f8d8c57ec5ee09e3b60df3cac60453c40)

8 years agomon: remove bad rocksdb option 14236/head
Sage Weil [Mon, 2 May 2016 19:29:12 +0000 (15:29 -0400)]
mon: remove bad rocksdb option

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

8 years agojewel: librbd: possible race in ExclusiveLock handle_peer_notification 14233/head
Mykola Golub [Tue, 28 Mar 2017 13:55:11 +0000 (15:55 +0200)]
jewel: librbd: possible race in ExclusiveLock handle_peer_notification

This is a cherry-pick from kraken -- the master diverged after
ManagedLock refactoring and is not affected.

Fix: http://tracker.ceph.com/issues/19368
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit df59d6d5f7deb586cf14a6ef6984e6847db08852)

8 years agorgw_file: RGWFileHandle dtor must also cond-unlink from FHCache 14231/head
Matt Benjamin [Wed, 1 Mar 2017 01:24:12 +0000 (20:24 -0500)]
rgw_file: RGWFileHandle dtor must also cond-unlink from FHCache

Formerly masked in part by the reclaim() action, direct-delete now
substitutes for reclaim() iff its LRU lane is over its high-water
mark, and in particular, like reclaim() the destructor is certain
to see handles still interned on the FHcache when nfs-ganesha is
recycling objects from its own LRU.

Fixes: http://tracker.ceph.com/issues/19112
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit d51a3b1224ba62bb53c6c2c7751fcf7853c35a4b)

8 years agorgw_file: split last argv on ws, if provided 14230/head
Matt Benjamin [Tue, 17 Jan 2017 16:23:45 +0000 (11:23 -0500)]
rgw_file:  split last argv on ws, if provided

This is intended to allow an "extra" unparsed argument string
containing various cmdline options to be passed as the last argument
in the argv array of librgw_create(), which nfs-ganesha is
expecting to happen.

While at it, hook env_args() too.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit fbc19e4effc736c98cc1cc283e5c7b131a0fa766)

8 years agorgw_file: fix hiwat behavior
Matt Benjamin [Mon, 13 Feb 2017 01:18:26 +0000 (20:18 -0500)]
rgw_file: fix hiwat behavior

Removed logic to skip reclaim processing conditionally on hiwat,
this probably meant to be related to a lowat value, which does
not exist.

Having exercised the hiwat reclaim behavior, noticed that the
path which moves unreachable objects to LRU, could and probably
should remove them altogether when q.size exceeds hiwat.  Now
the max unreachable float is lane hiwat, for all lanes.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit b8791b2217e9ca87b2d17b51f283fa14bd68b581)
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agorgw_file: refcnt bugfixes
Matt Benjamin [Sun, 12 Feb 2017 23:20:43 +0000 (18:20 -0500)]
rgw_file: refcnt bugfixes

This change includes 3 related changes:

1. add required lock flags for FHCache updates--this is a crash
   bug under concurrent update/lookup

2. omit to inc/dec refcnt on root filehandles in 2 places--the
   root handle current is not on the lru list, so it's not
   valid to do so

3. based on observation of LRU behavior during creates/deletes,
   update (cohort) LRU unref to move objects to LRU when their
   refcount falls to SENTINEL_REFCNT--this cheaply primes the
   current reclaim() mechanism, so very significanty improves
   space use (e.g., after deletes) in the absence of scans
   (which is common due to nfs-ganesha caching)

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit beaeff059375b44188160dbde8a81dd4f4f8c6eb)
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agorgw_file: add refcount dout traces at debuglevel 17
Matt Benjamin [Sat, 11 Feb 2017 21:38:05 +0000 (16:38 -0500)]
rgw_file:  add refcount dout traces at debuglevel 17

These are helpful for checking RGWFileHandle refcnt invariants.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 462034e17f919fb783ee33e2c9fa8089f93fd97d)
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agorgw_file: add pretty-print for RGWFileHandle
Matt Benjamin [Fri, 10 Feb 2017 22:14:16 +0000 (17:14 -0500)]
rgw_file: add pretty-print for RGWFileHandle

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit ef330f385d3407af5f470b5093145f59cc4dcc79)
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agorgw_file: fix marker computation 13869/head
Matt Benjamin [Mon, 20 Feb 2017 20:05:18 +0000 (15:05 -0500)]
rgw_file: fix marker computation

Fixes: http://tracker.ceph.com/issues/19018
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 4454765e7dd08535c50d24205858e18dba4b454c)

8 years agorgw_file: rgw_readdir can't list multi-segment dirs
Matt Benjamin [Mon, 20 Feb 2017 01:34:31 +0000 (20:34 -0500)]
rgw_file: rgw_readdir can't list multi-segment dirs

This issue has one root cause in librgw, namely that the marker
argument to these requests was incorrectly formatted (though the
marker cache was working as intended).

Secondarily, for nfs-ganesha users, there is a compounding issue
that the RGW fsal was required by "temporary" convention to
populate the entire dirent cache for a directory on a single
readdir() invocation--the cache_inode/mdcache implementations
invariantly pass (before future 2.5 changesets, currently in
progress) a null pointer for the start cookie offset, intended
to convey this.

Fixes: http://tracker.ceph.com/issues/18991
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 2cd60ee9712291b906123aca1704288b18a9742b)

8 years agorgw_file: allow setattr on placeholder directories
Matt Benjamin [Sun, 19 Feb 2017 23:21:06 +0000 (18:21 -0500)]
rgw_file: allow setattr on placeholder directories

When a POSIX path <bucket>/foo/ is known only as an implicit path
segment from other objects (e.g., <bucket>/foo/bar.txt), a case
that would usually arise from S3 upload of such an object, an
RGWFileHandle object representing "<bucket>/foo/" will be constructed
as needed, with no backing in RGW.

This is by design, but subsequently, if a setattr is performed on
such a handle, we must be ready to create the object inline with
storing the attributes.

Fixes: http://tracker.ceph.com/issues/18989
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 55eec1c0a0e136736961423b7b6244d0f3693c1a)

8 years agoMerge pull request #14140 from smithfarm/wip-19341-jewel
Ken Dreyer [Tue, 28 Mar 2017 22:36:35 +0000 (16:36 -0600)]
Merge pull request #14140 from smithfarm/wip-19341-jewel

jewel: 'period update' does not remove short_zone_ids of deleted zones

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #13886 from cbodley/wip-17786
Ken Dreyer [Tue, 28 Mar 2017 22:35:16 +0000 (16:35 -0600)]
Merge pull request #13886 from cbodley/wip-17786

jewel: rgw: clear data_sync_cr if RGWDataSyncControlCR fails

Reviewed-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #13867 from smithfarm/wip-19159-jewel
Ken Dreyer [Tue, 28 Mar 2017 22:34:57 +0000 (16:34 -0600)]
Merge pull request #13867 from smithfarm/wip-19159-jewel

jewel: rgw: multisite: RGWMetaSyncShardControlCR gives up on EIO

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #13858 from smithfarm/wip-19152-jewel
Ken Dreyer [Tue, 28 Mar 2017 22:34:24 +0000 (16:34 -0600)]
Merge pull request #13858 from smithfarm/wip-19152-jewel

jewel: rgw_file:  restore (corrected) fix for dir partial match (return of FLAG_EXACT_MATCH)

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #13848 from smithfarm/wip-19150-jewel
Ken Dreyer [Tue, 28 Mar 2017 22:33:18 +0000 (16:33 -0600)]
Merge pull request #13848 from smithfarm/wip-19150-jewel

jewel: rgw_file:  avoid interning .. in FHCache table and don't ref for them

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #13844 from smithfarm/wip-19148-jewel
Ken Dreyer [Tue, 28 Mar 2017 22:29:30 +0000 (16:29 -0600)]
Merge pull request #13844 from smithfarm/wip-19148-jewel

jewel: rgw: DUMPABLE flag is cleared by setuid preventing coredumps

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #13823 from asheplyakov/19176-bp-jewel
Ken Dreyer [Tue, 28 Mar 2017 22:26:48 +0000 (16:26 -0600)]
Merge pull request #13823 from asheplyakov/19176-bp-jewel

jewel: rgw: fix swift cannot disable object versioning with empty X-Versions-Location

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #13778 from smithfarm/wip-18811-jewel
Ken Dreyer [Tue, 28 Mar 2017 22:22:23 +0000 (16:22 -0600)]
Merge pull request #13778 from smithfarm/wip-18811-jewel

jewel: librgw: RGWLibFS::setattr fails on directories

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agoMerge pull request #13717 from asheplyakov/19115-bp-jewel
Ken Dreyer [Tue, 28 Mar 2017 22:21:44 +0000 (16:21 -0600)]
Merge pull request #13717 from asheplyakov/19115-bp-jewel

jewel: rgw_file: ensure valid_s3_object_name for directories, too

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agoMerge pull request #13596 from dillaman/wip-19038-jewel
Ken Dreyer [Tue, 28 Mar 2017 22:19:03 +0000 (16:19 -0600)]
Merge pull request #13596 from dillaman/wip-19038-jewel

jewel: rbd-mirror: deleting a snapshot during sync can result in read errors

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #13583 from asheplyakov/jewel-bp-18901
Ken Dreyer [Tue, 28 Mar 2017 22:10:43 +0000 (16:10 -0600)]
Merge pull request #13583 from asheplyakov/jewel-bp-18901

jewel: rgw_file:  interned RGWFileHandle objects need parent refs

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #13503 from linuxbox2/wip-jewel-10156
Ken Dreyer [Tue, 28 Mar 2017 22:02:43 +0000 (16:02 -0600)]
Merge pull request #13503 from linuxbox2/wip-jewel-10156

jewel: rgw: make sending Content-Length in 204 and 304 controllable

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>