]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agorpm: Fix undefined FIRST_ARG 15509/head
Boris Ranto [Fri, 7 Jul 2017 10:37:55 +0000 (12:37 +0200)]
rpm: Fix undefined FIRST_ARG

If FIRST_ARG is undefined, the rpms will show an error on upgrade
because the condition in the postun script gets broken.

This was a regression introduced by commit for issue 20077 that moved
ceph-disk unit files to ceph-base.

Fixes: http://tracker.ceph.com/issues/20077
Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit 562816914ccca8e4e7d9c31f333db2f0da6f7c99)

8 years agoselinux: Install ceph-base before ceph-selinux
Boris Ranto [Mon, 5 Jun 2017 16:44:18 +0000 (18:44 +0200)]
selinux: Install ceph-base before ceph-selinux

We need to have ceph-base installed before ceph-selinux to use ceph-disk
in %post script. The default ordering is random and so the installation
randomly failed to relabel the files.

Fixes: http://tracker.ceph.com/issues/20184
Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit e69086645d3411a2ed781609b670eb5f16ac4810)
Conflicts:
ceph.spec.in: No _epoch_prefix in kraken.

8 years agorpm: Move ceph-disk to ceph-base
Boris Ranto [Fri, 26 May 2017 07:52:25 +0000 (09:52 +0200)]
rpm: Move ceph-disk to ceph-base

The SELinux package now requires the ceph-disk binary but that one was
part of the ceph-osd package. The ceph-disk python library is already
packaged in ceph-base so moving ceph-disk to ceph-base seems like a
reasonable next step.

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit 6991764f3bff7b8f6be699603927aff882377878)

Conflicts:
ceph.spec.in: ceph-disk-udev is present in kraken

8 years agoceph-disk: Fix the file ownership, skip missing
Boris Ranto [Thu, 25 May 2017 12:36:13 +0000 (14:36 +0200)]
ceph-disk: Fix the file ownership, skip missing

This commit fixes the file ownership for the /usr/bin/ and /etc/ceph
files and skips missing files as some of the files that we do specify
now can be missing from the system (not installed, e.f. radosgw).

Fixes: http://tracker.ceph.com/issues/20077
Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit 077038b4393a28ccbd38ca4a90105dbd4c1ffcd5)

8 years agoselinux: Do parallel relabel on package install
Boris Ranto [Fri, 28 Apr 2017 10:29:46 +0000 (12:29 +0200)]
selinux: Do parallel relabel on package install

We can take advantage of ceph-disk fix subcommand when doing a package
install. We will keep using the differential fixfiles command otherwise.

We also need to add relabel for /usr/bin/ daemons so that we could use
this.

Fixes: http://tracker.ceph.com/issues/20077
Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit 1cecddf031991f1c64ea203f173189624f11940e)

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

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoosd: Object level shard errors are tracked and used if no auth available 15421/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)

8 years agoMerge pull request #14345 from ceph/wip-ceph-disk-fix-kraken
Boris Ranto [Thu, 11 May 2017 06:06:47 +0000 (08:06 +0200)]
Merge pull request #14345 from ceph/wip-ceph-disk-fix-kraken

ceph-disk: Add fix subcommand kraken back-port

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
8 years agoceph-disk: Add --system option for fix command 14345/head
Boris Ranto [Wed, 8 Mar 2017 08:38:39 +0000 (09:38 +0100)]
ceph-disk: Add --system option for fix command

This adds the ability to restore the labels of the underlying system
data in addition to ceph data.

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit 8d81af42fd507c7b92c8279eb114b0a733ac1da6)

8 years agoceph-disk: Add more fix targets
Boris Ranto [Thu, 16 Feb 2017 10:34:27 +0000 (11:34 +0100)]
ceph-disk: Add more fix targets

It turns out I forgot several more directories that needs to be fixed by
this script. We need to fix /var/log/ceph, /var/run/ceph and /etc/ceph
as well.

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit ae139307d6b2bfba47e21d29d6dbd3c8dc01b5b5)

8 years agoceph-disk: Add unit test for fix command
Boris Ranto [Thu, 9 Feb 2017 18:17:12 +0000 (19:17 +0100)]
ceph-disk: Add unit test for fix command

This will simulate the command* functions to not actually run anything
thus excercising the python code directly. It also checks that the
proper (sub-strings) are in the output.

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit 1ec53dee9a690134936bdc3a09c9a02fecf13a9d)

8 years agoceph-disk: Add fix subcommand
Boris Ranto [Tue, 31 Jan 2017 12:19:33 +0000 (13:19 +0100)]
ceph-disk: Add fix subcommand

This subcommand will fix the SELinux labels and/or file permissions on
ceph data (/var/lib/ceph).

The command is also optimized to run the commands in parallel (per
sub-dir in /var/lib/ceph) and do restorecon and chown at the same time
to take advantage of the caching mechanisms.

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit 6d5d30f6ed7538271579cc2ef4e2e364f01a4a6f)

8 years agoMerge pull request #14983 from liewegas/wip-denc-dump-kraken
Sage Weil [Mon, 8 May 2017 16:33:59 +0000 (11:33 -0500)]
Merge pull request #14983 from liewegas/wip-denc-dump-kraken

ceph-object-corpus: kraken objects (kraken)

8 years agotest/encoding/readable.sh: join children at finish 14983/head
Sage Weil [Mon, 27 Feb 2017 21:10:34 +0000 (16:10 -0500)]
test/encoding/readable.sh: join children at finish

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

8 years agotest/encoding/readable: fix passing of results to parent
Sage Weil [Mon, 27 Feb 2017 21:10:24 +0000 (16:10 -0500)]
test/encoding/readable: fix passing of results to parent

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

8 years agomessages/MCommand: fix type on decode
Sage Weil [Fri, 5 May 2017 20:48:25 +0000 (16:48 -0400)]
messages/MCommand: fix type on decode

Wow, this has been broken since v0.38, but apparently
the message never made it into the object corpus so
we never noticed!

In reality the bug is harmless: decode_message() will
set_header which clobbers whatever version the default
ctor fills in, so this only affects ceph-dencoder's
test.

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

8 years agoceph-object-corpus: kraken objects
Sage Weil [Fri, 5 May 2017 20:32:48 +0000 (16:32 -0400)]
ceph-object-corpus: kraken objects

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agotest/encoding/generate-corpus-objects: fix typo
Sage Weil [Fri, 5 May 2017 20:31:02 +0000 (16:31 -0400)]
test/encoding/generate-corpus-objects: fix typo

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

8 years agotest/encoding/generate-corpus-objects.sh: simplify object corpus population
Sage Weil [Fri, 5 May 2017 13:19:23 +0000 (09:19 -0400)]
test/encoding/generate-corpus-objects.sh: simplify object corpus population

Script that generates corpus objects.

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

8 years agoqa/workunits/rgw/run-s3tests.sh: run s3-tests
Sage Weil [Fri, 5 May 2017 19:19:05 +0000 (15:19 -0400)]
qa/workunits/rgw/run-s3tests.sh: run s3-tests

This works out of the box with a vstart environment and

 RGW=1 ../src/vstart.sh -n -l
 PATH=bin:$PATH ../qa/workunits/rgw/run-s3tests.sh

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

8 years agoinclude/denc: support ENCODE_DUMP
Sage Weil [Thu, 4 May 2017 22:33:21 +0000 (18:33 -0400)]
include/denc: support ENCODE_DUMP

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

8 years agomgr/DaemonServer: do not crash on bad authorizer 14097/head
Sage Weil [Fri, 28 Apr 2017 22:03:59 +0000 (18:03 -0400)]
mgr/DaemonServer: do not crash on bad authorizer

Signed-off-by: Sage Weil <sage@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