]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agoosd: Reset() the snaptrimmer on shutdown
Greg Farnum [Fri, 26 May 2017 04:52:49 +0000 (21:52 -0700)]
osd: Reset() the snaptrimmer on shutdown

We were failing to exit various wait states which held PGRefs. Error!

Fixes: http://tracker.ceph.com/issues/19931
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit b0e9deeea8a8e90f6d7e9d56b6b4aed890e01d7b)

8 years agoosd: print out pg debug ref counts on acquire/drop
Greg Farnum [Thu, 25 May 2017 01:43:34 +0000 (18:43 -0700)]
osd: print out pg debug ref counts on acquire/drop

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

8 years agoosd: repair the PG_DEBUG_REFS build
Greg Farnum [Mon, 10 Jul 2017 20:31:21 +0000 (13:31 -0700)]
osd: repair the PG_DEBUG_REFS build

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

Conflicts:
src/osd/OSD.cc
src/osd/Session.h

8 years agoosd: use PGRef instead of boost::intrusive_ptr<PG> everywhere
Greg Farnum [Wed, 24 May 2017 07:19:51 +0000 (00:19 -0700)]
osd: use PGRef instead of boost::intrusive_ptr<PG> everywhere

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

8 years agoPendingReleaseNotes: discuss snap trim improvements 14813/head
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 [Fri, 7 Apr 2017 22:45:12 +0000 (15:45 -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>
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)

8 years agoosd/: add PG_STATE_SNAPTRIM[_WAIT] to expose snap trim state to user
Samuel Just [Thu, 26 Jan 2017 23:05:14 +0000 (15:05 -0800)]
osd/: add PG_STATE_SNAPTRIM[_WAIT] to expose snap trim state to user

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

8 years agoosd/PrimaryLogPG: limit the number of concurrently trimming pgs
Greg Farnum [Fri, 7 Apr 2017 22:41:18 +0000 (15:41 -0700)]
osd/PrimaryLogPG: 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>
8 years agoMerge pull request #14506 from smithfarm/wip-19119-kraken
Nathan Cutler [Wed, 26 Apr 2017 17:53:49 +0000 (19:53 +0200)]
Merge pull request #14506 from smithfarm/wip-19119-kraken

kraken: doc: PendingReleaseNotes: warning about 'osd rm ...' and #13733

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14692 from smithfarm/wip-fix-hammer-jewel-x
Nathan Cutler [Wed, 26 Apr 2017 17:28:58 +0000 (19:28 +0200)]
Merge pull request #14692 from smithfarm/wip-fix-hammer-jewel-x

qa/suites/upgrade: add tiering test to hammer-jewel-x

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14425 from smithfarm/wip-19564-kraken
Nathan Cutler [Mon, 24 Apr 2017 20:22:14 +0000 (22:22 +0200)]
Merge pull request #14425 from smithfarm/wip-19564-kraken

kraken: build/ops: ceph-base missing dependency for psmisc in Ubuntu Xenial

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
8 years agoMerge pull request #13494 from shinobu-x/wip-18516-kraken
Nathan Cutler [Sat, 22 Apr 2017 08:55:16 +0000 (10:55 +0200)]
Merge pull request #13494 from shinobu-x/wip-18516-kraken

kraken: build/ops: systemd: Start OSDs after MONs

Reviewed-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #14588 from asheplyakov/19618-kraken
Nathan Cutler [Fri, 21 Apr 2017 15:36:42 +0000 (17:36 +0200)]
Merge pull request #14588 from asheplyakov/19618-kraken

kraken: mon/MonClient: make get_mon_log_message() atomic

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #13543 from shinobu-x/wip-18954-kraken
Nathan Cutler [Fri, 21 Apr 2017 15:12:29 +0000 (17:12 +0200)]
Merge pull request #13543 from shinobu-x/wip-18954-kraken

kraken: ceph-disk prepare get wrong group name in bluestore

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #12746 from SUSE/wip-18387-kraken
Nathan Cutler [Fri, 21 Apr 2017 06:53:25 +0000 (08:53 +0200)]
Merge pull request #12746 from SUSE/wip-18387-kraken

kraken: tests: use ceph-kraken branch for s3tests

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoqa/suites/upgrade: add tiering test to hammer-jewel-x 14692/head
Kefu Chai [Mon, 6 Mar 2017 07:50:59 +0000 (15:50 +0800)]
qa/suites/upgrade: add tiering test to hammer-jewel-x

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

8 years agoMerge pull request #14620 from smithfarm/wip-19659-kraken
Nathan Cutler [Thu, 20 Apr 2017 19:12:42 +0000 (21:12 +0200)]
Merge pull request #14620 from smithfarm/wip-19659-kraken

kraken: librbd: corrected resize RPC message backwards compatibility

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14574 from smithfarm/wip-19620-kraken
Nathan Cutler [Thu, 20 Apr 2017 17:06:35 +0000 (19:06 +0200)]
Merge pull request #14574 from smithfarm/wip-19620-kraken

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

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14573 from smithfarm/wip-19483-kraken
Nathan Cutler [Thu, 20 Apr 2017 17:05:44 +0000 (19:05 +0200)]
Merge pull request #14573 from smithfarm/wip-19483-kraken

kraken: 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 #14572 from smithfarm/wip-19335-kraken
Nathan Cutler [Thu, 20 Apr 2017 17:04:34 +0000 (19:04 +0200)]
Merge pull request #14572 from smithfarm/wip-19335-kraken

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

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14571 from smithfarm/wip-19045-kraken
Nathan Cutler [Thu, 20 Apr 2017 17:03:42 +0000 (19:03 +0200)]
Merge pull request #14571 from smithfarm/wip-19045-kraken

kraken: cephfs: buffer overflow in test LibCephFS.DirLs

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14570 from smithfarm/wip-18950-kraken
Nathan Cutler [Thu, 20 Apr 2017 17:02:54 +0000 (19:02 +0200)]
Merge pull request #14570 from smithfarm/wip-18950-kraken

kraken: cephfs: mds/StrayManager: avoid reusing deleted inode in StrayManager::_purge_stray_logged

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14569 from smithfarm/wip-18899-kraken
Nathan Cutler [Thu, 20 Apr 2017 17:02:02 +0000 (19:02 +0200)]
Merge pull request #14569 from smithfarm/wip-18899-kraken

kraken: cephfs: test_open_inode fails

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14568 from smithfarm/wip-18706-kraken
Nathan Cutler [Thu, 20 Apr 2017 17:00:51 +0000 (19:00 +0200)]
Merge pull request #14568 from smithfarm/wip-18706-kraken

kraken: cephfs: fragment space check can cause replayed request fail

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14567 from smithfarm/wip-18700-kraken
Nathan Cutler [Thu, 20 Apr 2017 16:59:25 +0000 (18:59 +0200)]
Merge pull request #14567 from smithfarm/wip-18700-kraken

kraken: cephfs: client: fix the cross-quota rename boundary check conditions

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14566 from smithfarm/wip-18616-kraken
Nathan Cutler [Thu, 20 Apr 2017 16:58:08 +0000 (18:58 +0200)]
Merge pull request #14566 from smithfarm/wip-18616-kraken

kraken: cephfs: segfault in handle_client_caps

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14565 from smithfarm/wip-18566-kraken
Nathan Cutler [Thu, 20 Apr 2017 16:57:08 +0000 (18:57 +0200)]
Merge pull request #14565 from smithfarm/wip-18566-kraken

kraken: cephfs: MDS crashes on missing metadata object

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14564 from smithfarm/wip-18562-kraken
Nathan Cutler [Thu, 20 Apr 2017 16:56:04 +0000 (18:56 +0200)]
Merge pull request #14564 from smithfarm/wip-18562-kraken

kraken: cephfs: test_client_recovery.TestClientRecovery fails

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14563 from smithfarm/wip-18552-kraken
Nathan Cutler [Thu, 20 Apr 2017 16:55:01 +0000 (18:55 +0200)]
Merge pull request #14563 from smithfarm/wip-18552-kraken

kraken: cephfs: ceph-fuse crash during snapshot tests

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14521 from smithfarm/wip-19462-kraken
Nathan Cutler [Thu, 20 Apr 2017 16:18:59 +0000 (18:18 +0200)]
Merge pull request #14521 from smithfarm/wip-19462-kraken

kraken: doc: rgw: admin ops: fix the quota section

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #14641 from smithfarm/wip-19693-kraken
Nathan Cutler [Thu, 20 Apr 2017 12:52:45 +0000 (14:52 +0200)]
Merge pull request #14641 from smithfarm/wip-19693-kraken

kraken: [test] test_notify.py: rbd.InvalidArgument: error updating features for image test_notify_clone2

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14533 from smithfarm/wip-18501-kraken
Nathan Cutler [Thu, 20 Apr 2017 12:51:45 +0000 (14:51 +0200)]
Merge pull request #14533 from smithfarm/wip-18501-kraken

kraken: rbd-mirror: potential race mirroring cloned image

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14534 from smithfarm/wip-18549-kraken
Nathan Cutler [Thu, 20 Apr 2017 12:50:56 +0000 (14:50 +0200)]
Merge pull request #14534 from smithfarm/wip-18549-kraken

kraken: rbd: 'metadata_set' API operation should not change global config setting

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14536 from smithfarm/wip-18557-kraken
Nathan Cutler [Thu, 20 Apr 2017 12:50:11 +0000 (14:50 +0200)]
Merge pull request #14536 from smithfarm/wip-18557-kraken

kraken: rbd: 'rbd bench-write' will crash if --io-size is 4G

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14537 from smithfarm/wip-18601-kraken
Nathan Cutler [Thu, 20 Apr 2017 12:49:24 +0000 (14:49 +0200)]
Merge pull request #14537 from smithfarm/wip-18601-kraken

kraken: rbd: Add missing parameter feedback to 'rbd snap limit'

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14538 from smithfarm/wip-18632-kraken
Nathan Cutler [Thu, 20 Apr 2017 12:23:08 +0000 (14:23 +0200)]
Merge pull request #14538 from smithfarm/wip-18632-kraken

kraken: rbd: [qa] crash in journal-enabled fsx run

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14622 from smithfarm/wip-19037-kraken
Nathan Cutler [Thu, 20 Apr 2017 12:19:59 +0000 (14:19 +0200)]
Merge pull request #14622 from smithfarm/wip-19037-kraken

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

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14545 from smithfarm/wip-19324-kraken
Nathan Cutler [Thu, 20 Apr 2017 12:18:48 +0000 (14:18 +0200)]
Merge pull request #14545 from smithfarm/wip-19324-kraken

kraken: rbd: [api] temporarily restrict (rbd_)mirror_peer_add from adding multiple peers

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agotest: rbd master/slave notify test should test active features 14641/head
Jason Dillaman [Wed, 19 Apr 2017 13:26:31 +0000 (09:26 -0400)]
test: rbd master/slave notify test should test active features

Fixes: http://tracker.ceph.com/issues/19692
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 0dcba41cba96566d0b8da54cf0316d523b88ded2)

8 years agoqa/suites: client-upgrade/jewel-client-x should test multiple features
Jason Dillaman [Wed, 19 Apr 2017 13:12:04 +0000 (09:12 -0400)]
qa/suites: client-upgrade/jewel-client-x should test multiple features

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 7ab93b7779b293ceda325a6d1cdb446cf624a6e3)

8 years agoMerge pull request #14487 from zmc/wip-kraken-workunit
Zack Cerza [Tue, 18 Apr 2017 20:17:02 +0000 (14:17 -0600)]
Merge pull request #14487 from zmc/wip-kraken-workunit

qa/tasks/workunit: Backport repo fixes from master

8 years agoMerge pull request #14531 from smithfarm/wip-18493-kraken
Nathan Cutler [Tue, 18 Apr 2017 20:09:19 +0000 (22:09 +0200)]
Merge pull request #14531 from smithfarm/wip-18493-kraken

kraken: rbd-mirror: sporadic image replayer shut down failure

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14532 from smithfarm/wip-18495-kraken
Nathan Cutler [Tue, 18 Apr 2017 20:08:34 +0000 (22:08 +0200)]
Merge pull request #14532 from smithfarm/wip-18495-kraken

kraken: rbd: Possible deadlock performing a synchronous API action while refresh in-progress

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agolibrbd: corrected resize RPC message backwards compatibility 14620/head
Jason Dillaman [Tue, 18 Apr 2017 14:05:53 +0000 (10:05 -0400)]
librbd: corrected resize RPC message backwards compatibility

Commit d1f2c557 incorrectly changed the order of variables within
the payload. This resulted in breaking the resize RPC message
with older versions of Ceph.

Fixes: http://tracker.ceph.com/issues/19636
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 9db305a99fd945059a173f5ae8ae61744dd28615)

8 years agoMerge pull request #14095 from shinobu-x/wip-19319-kraken
Nathan Cutler [Tue, 18 Apr 2017 14:58:39 +0000 (16:58 +0200)]
Merge pull request #14095 from shinobu-x/wip-19319-kraken

kraken: RadosImport::import should return an error if Rados::connect fails

Reviewed-by: David Zafman <dzafman@redhat.com>
8 years agomon/MonClient: make get_mon_log_message() atomic 14588/head
Kefu Chai [Mon, 10 Apr 2017 06:53:46 +0000 (14:53 +0800)]
mon/MonClient: make get_mon_log_message() atomic

* LogClient: move reset_session() into get_mon_log_message() and add a
  "flush" param to the latter. so it can get_mon_log_message()
  atomically. otherwise another call changing the log queue could sneak
  in between reset_session() and get_mon_log_message().
* MonClient: add a "flush" param to do_send() so we can reset the
  LogClient session once we are connected to a monitor.

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

Conflicts:
src/mon/MonClient.cc: handle_auth: replaced 'log_client->reset_session();
send_log();' sequence with newly introduced 'send_log(true);' like
the original patch does

8 years agoMerge pull request #14323 from shinobu-x/wip-19371-kraken
Nathan Cutler [Sun, 16 Apr 2017 02:13:12 +0000 (04:13 +0200)]
Merge pull request #14323 from shinobu-x/wip-19371-kraken

kraken: common: monitor creation with IPv6 public network segfaults

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #13284 from shinobu-x/wip-18599-kraken
Nathan Cutler [Sat, 15 Apr 2017 08:08:15 +0000 (10:08 +0200)]
Merge pull request #13284 from shinobu-x/wip-18599-kraken

kraken: osd: os/bluestore: fix statfs to not include DB partition in free space

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #13046 from SUSE/wip-18554-kraken
Nathan Cutler [Sat, 15 Apr 2017 07:57:21 +0000 (09:57 +0200)]
Merge pull request #13046 from SUSE/wip-18554-kraken

kraken: mon: peon wrongly delete routed pg stats op before receive pg stats ack

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14480 from dillaman/wip-19467-kraken
Nathan Cutler [Fri, 14 Apr 2017 22:30:39 +0000 (00:30 +0200)]
Merge pull request #14480 from dillaman/wip-19467-kraken

kraken: librbd: is_exclusive_lock_owner API should ping OSD

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #13877 from smithfarm/wip-19178-kraken
Nathan Cutler [Fri, 14 Apr 2017 22:28:19 +0000 (00:28 +0200)]
Merge pull request #13877 from smithfarm/wip-19178-kraken

kraken: rgw: anonymous user error code of getting object is not consistent with SWIFT

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
8 years agoMerge pull request #13866 from smithfarm/wip-19157-kraken
Nathan Cutler [Fri, 14 Apr 2017 22:25:51 +0000 (00:25 +0200)]
Merge pull request #13866 from smithfarm/wip-19157-kraken

kraken: rgw: health check errors out incorrectly

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
8 years agoMerge pull request #13843 from smithfarm/wip-19146-kraken
Nathan Cutler [Fri, 14 Apr 2017 22:22:22 +0000 (00:22 +0200)]
Merge pull request #13843 from smithfarm/wip-19146-kraken

kraken: rgw: a few cases where rgw_obj is incorrectly initialized

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoMerge pull request #13829 from smithfarm/wip-18898-kraken
Nathan Cutler [Fri, 14 Apr 2017 22:20:29 +0000 (00:20 +0200)]
Merge pull request #13829 from smithfarm/wip-18898-kraken

kraken: no http referer info in container metadata dump in swift API

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
8 years agoMerge pull request #13780 from smithfarm/wip-18896-kraken
Nathan Cutler [Fri, 14 Apr 2017 22:19:00 +0000 (00:19 +0200)]
Merge pull request #13780 from smithfarm/wip-18896-kraken

kraken: should parse the url to http host to compare with the container referer acl

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
8 years agoMerge pull request #12986 from Werkov/rgw-fix-tempurl-url-encoding
Nathan Cutler [Fri, 14 Apr 2017 22:15:15 +0000 (00:15 +0200)]
Merge pull request #12986 from Werkov/rgw-fix-tempurl-url-encoding

kraken: rgw: Use decoded URI when verifying TempURL

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
8 years agotools/cephfs: set dir_layout when injecting inodes 14574/head
John Spray [Wed, 29 Mar 2017 18:38:37 +0000 (19:38 +0100)]
tools/cephfs: set dir_layout when injecting inodes

When we left this as zero, the MDS would interpret it was HASH_LINUX
rather than the default HASH_RJENKINS.  Potentially that
could cause problems if there perhaps were already dirfrags in
the metadata pool that were set up using rjenkins.  Mainly
it just seems more appropriate to explicitly set this field
rather than hit the fallback behaviour.

Related: http://tracker.ceph.com/issues/19406
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 7d6d542885bd29b71214f9ca52bd26e9183c5d01)

8 years agomon: fix hiding mdsmonitor informative strings 14573/head
John Spray [Thu, 9 Mar 2017 13:15:46 +0000 (13:15 +0000)]
mon: fix hiding mdsmonitor informative strings

Local `stringstream ss` declarations were hiding
the real variable used to feed back to the user.

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

8 years agomds: reset heartbeat in export_remaining_imported_caps 14572/head
John Spray [Mon, 6 Mar 2017 11:51:31 +0000 (11:51 +0000)]
mds: reset heartbeat in export_remaining_imported_caps

This loop can be very long.

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

8 years agomds: heartbeat_reset in dispatch
John Spray [Mon, 6 Mar 2017 11:24:50 +0000 (11:24 +0000)]
mds: heartbeat_reset in dispatch

Previously we only heartbeated in tick.  However, our locking is
not guaranteed to be fair, so on a super-busy dispatch queue it may be
possible for the heartbeat to time out while the tick() function
is waiting for mds_lock.

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

8 years agotest/libcephfs: avoid buffer overflow when testing ceph_getdents() 14571/head
Yan, Zheng [Wed, 15 Feb 2017 03:45:26 +0000 (11:45 +0800)]
test/libcephfs: avoid buffer overflow when testing ceph_getdents()

The buffer size should be at least "2 * sizeof(struct dirent)".
Otherwise, the code that checks dentry '..' overflow.

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

8 years agomds/StrayManager: aviod reusing deleted inode in StrayManager::_purge_stray_logged 14570/head
Zhi Zhang [Fri, 10 Feb 2017 02:56:46 +0000 (10:56 +0800)]
mds/StrayManager: aviod reusing deleted inode in StrayManager::_purge_stray_logged

Signed-off-by: Zhi Zhang <zhangz.david@outlook.com>
(cherry picked from commit 4978e57419482384279d7e784a625f5e5c10961a)

8 years agotasks/cephfs: switch open vs. write in test_open_inode 14569/head
John Spray [Wed, 1 Feb 2017 00:38:08 +0000 (00:38 +0000)]
tasks/cephfs: switch open vs. write in test_open_inode

Do the write after opening the file, so that we get good
behaviour wrt the change in Mount.open_background that uses
file existence to confirm that the open happened.

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

8 years agoqa: fix race in Mount.open_background
John Spray [Thu, 26 Jan 2017 16:48:58 +0000 (16:48 +0000)]
qa: fix race in Mount.open_background

Previously a later remote call could end up executing
before the remote python program in open_background
had actually got as far as opening the file.

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

8 years agomds: don't purge strays when mds is in clientreplay state 14568/head
Yan, Zheng [Wed, 25 Jan 2017 07:28:23 +0000 (15:28 +0800)]
mds: don't purge strays when mds is in clientreplay state

MDS does not trim log when it's in clientreplay state. If mds hang
at clientreplay state (due to bug), purging strays can submit lots
of log events and create very large mds log.

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

8 years agomds: skip fragment space check for replayed request
Yan, Zheng [Wed, 25 Jan 2017 03:03:45 +0000 (11:03 +0800)]
mds: skip fragment space check for replayed request

when handling replayed request, stray directory can be different
from the stray directory used by the original request. The fragment
space check for stray directory can fail.

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

8 years agoclient: fix the cross-quota rename boundary check conditions 14567/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)

8 years agomds: fix null pointer dereference in Locker::handle_client_caps 14566/head
Yan, Zheng [Fri, 6 Jan 2017 07:42:52 +0000 (15:42 +0800)]
mds: fix null pointer dereference in Locker::handle_client_caps

Locker::handle_client_caps delays processing cap message if the
corresponding inode is freezing or frozen. When the message gets
processed, client can have already closed the session.

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

8 years agoqa/tasks: add test_open_ino_errors 14565/head
Yan, Zheng [Wed, 11 Jan 2017 07:50:52 +0000 (15:50 +0800)]
qa/tasks: add test_open_ino_errors

Validate that errors encountered during opening inos are properly
propagated

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

8 years agomds: propagate error encountered during opening inode by number
Yan, Zheng [Tue, 3 Jan 2017 03:11:12 +0000 (11:11 +0800)]
mds: propagate error encountered during opening inode by number

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

8 years agoqa/tasks/cephfs: fix kernel force umount 14564/head
Yan, Zheng [Mon, 9 Jan 2017 12:47:37 +0000 (20:47 +0800)]
qa/tasks/cephfs: fix kernel force umount

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

8 years agoclient: fix Client::handle_cap_flushsnap_ack() crash 14563/head
Yan, Zheng [Tue, 10 Jan 2017 09:16:40 +0000 (17:16 +0800)]
client: fix Client::handle_cap_flushsnap_ack() crash

Struct CapSnap holds a reference to its parent inode. So erasing
struct CapSnap from Inode::cap_snaps may drop inode's last reference.
The inode gets freed in the middle of erasing struct CapSnap

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

8 years agorbd: prevent adding multiple mirror peers to a single pool 14545/head
Jason Dillaman [Fri, 10 Mar 2017 15:56:38 +0000 (10:56 -0500)]
rbd: prevent adding multiple mirror peers to a single pool

The rbd-mirror daemon does not currently support replication
from multiple peers. Until that is supported, add a temporary
restriction to prevent confusion.

Fixes: http://tracker.ceph.com/issues/19256
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit c0c9d1014d57b3d5b95e7513fcc38d04b9ea5165)

8 years agorbd-mirror: retry object copy after -ENOENT error 14542/head 14622/head
Jason Dillaman [Tue, 21 Feb 2017 20:33:01 +0000 (15:33 -0500)]
rbd-mirror: retry object copy after -ENOENT error

Fixes: http://tracker.ceph.com/issues/18990
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit b4f36d5dc3f4f3cbb23f61cbb945b222248a50df)

8 years agorbd-mirror: object copy should always reference valid snapshots
Jason Dillaman [Tue, 21 Feb 2017 18:09:39 +0000 (13:09 -0500)]
rbd-mirror: object copy should always reference valid snapshots

If a remote snapshot is deleted while an image sync is in-progress,
associate the read request against the most recent, valid remote
snapshot for a given snapshot object clone.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 9a91efc3047963364944f8be91cee8e8f6afc49a)

8 years agorbd-mirror: replace complex object op tuple with struct
Jason Dillaman [Tue, 21 Feb 2017 16:52:00 +0000 (11:52 -0500)]
rbd-mirror: replace complex object op tuple with struct

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 0c181527c0e151784a0f7c466aaa70b0772f91b1)

8 years agojournal: don't hold future lock during assignment 14538/head
Jason Dillaman [Fri, 20 Jan 2017 19:26:43 +0000 (14:26 -0500)]
journal: don't hold future lock during assignment

It's possible that the future raced with its owner and reaches
an empty reference count. This was resulting in the future being
destructed while its lock was still held.

Fixes: http://tracker.ceph.com/issues/18618
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 0f21ceef8336e35ca16148a9d58f511037911418)

8 years agorbd: add error prompt when input command 'snap set limit' is incomplete 14537/head
tang.jin [Mon, 16 Jan 2017 14:28:23 +0000 (22:28 +0800)]
rbd: add error prompt when input command 'snap set limit' is incomplete

Signed-off-by: Tang Jin <tang.jin@istuary.com>
(cherry picked from commit 8860028f508a9be5a08f512022cfb042021fd19f)

8 years agorbd: bench-write should return error if io-size >= 4G 14536/head
Gaurav Kumar Garg [Tue, 10 Jan 2017 14:25:13 +0000 (15:25 +0100)]
rbd: bench-write should return error if io-size >= 4G

Currently if user perform bench-write with io-size > 4G
then its crashing because currently during memory allocation
bufferptr taking size of buffer as a unsigned and io-size > 4G
will overflow with unsigned. so during memset operation it will
try to set io_size size of memory area pointed by bufferptr,
(bufferptr area is:  (4G - io_size)), so it will cause
segmentation fault.

Fix is to return error if io-size >= 4G

Fixes: http://tracker.ceph.com/issues/18422
Reported-by: Jason Dillaman <dillaman@redhat.com>
Signed-off-by: Gaurav Kumar Garg <garg.gaurav52@gmail.com>
(cherry picked from commit 6ab73e5f420e89e19b52e39dab28fa4c94e00197)

8 years agolibrbd: metadata_set API operation should not change global config setting 14534/head
Mykola Golub [Mon, 9 Jan 2017 17:31:21 +0000 (18:31 +0100)]
librbd: metadata_set API operation should not change global config setting

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

8 years agolibrbd: delay mirror registration when creating clones 14533/head
Jason Dillaman [Tue, 6 Dec 2016 20:51:51 +0000 (15:51 -0500)]
librbd: delay mirror registration when creating clones

Fixes: http://tracker.ceph.com/issues/17993
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 778e1126a0343e2221446b8e13b48df5ccac263c)

8 years agolibrbd: possible deadlock with flush if refresh in-progress 14532/head
Jason Dillaman [Thu, 5 Jan 2017 17:12:57 +0000 (12:12 -0500)]
librbd: possible deadlock with flush if refresh in-progress

Fixes: http://tracker.ceph.com/issues/18419
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit b95f92a5572d3035c20eba07e76d2c825a9853f7)

8 years agorbd-mirror: avoid processing new events after stop requested 14531/head
Jason Dillaman [Fri, 6 Jan 2017 20:59:22 +0000 (15:59 -0500)]
rbd-mirror: avoid processing new events after stop requested

Fixes: http://tracker.ceph.com/issues/18441
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit d30873b269441815b5fc7de14c7d9a1077a17d8d)

8 years agodoc: rgw: correct the quota section 14521/head
hrchu [Wed, 29 Mar 2017 02:17:04 +0000 (02:17 +0000)]
doc: rgw: correct the quota section

Add the missing option and fix typo.

Fixes: http://tracker.ceph.com/issues/19397
Signed-off-by: Chu, Hua-Rong <hrchu@cht.com.tw>
(cherry picked from commit 51a88267f0d7f51aeb62092949b66b9f6c062e15)

8 years agoMerge pull request #13609 from smithfarm/wip-19064-kraken
Nathan Cutler [Thu, 13 Apr 2017 16:20:05 +0000 (18:20 +0200)]
Merge pull request #13609 from smithfarm/wip-19064-kraken

kraken: AttributeError: Thrasher instance has no attribute 'ceph_objectstore_tool'

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoPendingReleaseNotes: warning about 'osd rm ...' and #19119 14506/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)

Conflicts:
        PendingReleaseNotes
        - drop "Calculation of recovery priorities has been updated" because
          that was included in 11.2.0 release notes
        - do not backport >=12.0.0 release notes
        - change heading to 11.2.1

8 years agoMerge pull request #13790 from shinobu-x/wip-18298-kraken
Nathan Cutler [Thu, 13 Apr 2017 14:43:50 +0000 (16:43 +0200)]
Merge pull request #13790 from shinobu-x/wip-18298-kraken

kraken: mon: force_create_pg could leave pg stuck in creating state

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #13500 from shinobu-x/wip-18587-kraken
Nathan Cutler [Thu, 13 Apr 2017 14:41:16 +0000 (16:41 +0200)]
Merge pull request #13500 from shinobu-x/wip-18587-kraken

 kraken: mon: 'osd crush move ...' doesnt work on osds

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #13490 from shinobu-x/wip-18820-kraken
Nathan Cutler [Thu, 13 Apr 2017 14:39:51 +0000 (16:39 +0200)]
Merge pull request #13490 from shinobu-x/wip-18820-kraken

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

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #13295 from asheplyakov/kraken-bp-18497
Nathan Cutler [Thu, 13 Apr 2017 14:35:45 +0000 (16:35 +0200)]
Merge pull request #13295 from asheplyakov/kraken-bp-18497

kraken: osd: publish PG stats when backfill-related states change

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #13253 from liewegas/wip-enxio-kraken
Nathan Cutler [Thu, 13 Apr 2017 14:30:00 +0000 (16:30 +0200)]
Merge pull request #13253 from liewegas/wip-enxio-kraken

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

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #14322 from shinobu-x/wip-18619-kraken
Nathan Cutler [Thu, 13 Apr 2017 14:28:08 +0000 (16:28 +0200)]
Merge pull request #14322 from shinobu-x/wip-18619-kraken

kraken: osd: ceph degraded and misplaced status output inaccurate

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agolibrbd: is_exclusive_lock_owner API should ping OSD 14480/head
Jason Dillaman [Thu, 16 Mar 2017 16:28:41 +0000 (12:28 -0400)]
librbd: is_exclusive_lock_owner API should ping OSD

This is required to detect if a peer has been silently blacklisted
and is therefore no longer the lock owner.

Fixes: http://tracker.ceph.com/issues/19287
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit e15db05960a284bdf3701256722299d553cfd5aa)

Conflicts:
src/librbd/ManagedLock.[h|cc]: logic moved to ExclusiveLock

8 years agoMerge pull request #13216 from ovh/bp-osd-updateable-throttles-kraken
Nathan Cutler [Thu, 13 Apr 2017 09:11:44 +0000 (11:11 +0200)]
Merge pull request #13216 from ovh/bp-osd-updateable-throttles-kraken

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

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

kraken: osd: New added OSD always down when full flag is set

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #13091 from dzafman/wip-18624-kraken
Nathan Cutler [Thu, 13 Apr 2017 08:42:31 +0000 (10:42 +0200)]
Merge pull request #13091 from dzafman/wip-18624-kraken

kraken: osd: Revert "PrimaryLogPG::failed_push: update missing as well"

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #12790 from SUSE/wip-18418-kraken
Nathan Cutler [Wed, 12 Apr 2017 21:52:06 +0000 (23:52 +0200)]
Merge pull request #12790 from SUSE/wip-18418-kraken

kraken: osd: leveldb corruption leads to Operation not permitted not handled and assert

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #13172 from smithfarm/wip-18713-kraken
Nathan Cutler [Wed, 12 Apr 2017 21:03:40 +0000 (23:03 +0200)]
Merge pull request #13172 from smithfarm/wip-18713-kraken

kraken: rgw: radosgw-admin period update reverts deleted zonegroup

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #13176 from smithfarm/wip-18709-kraken
Nathan Cutler [Wed, 12 Apr 2017 21:02:35 +0000 (23:02 +0200)]
Merge pull request #13176 from smithfarm/wip-18709-kraken

kraken: rgw: multisite: sync status reports master is on a different period

Reviewed-by: Casey Bodley <cbodley@redhat.com>