]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agotests: use ceph-jewel branch for s3tests 12745/head
Orit Wasserman [Mon, 4 Jan 2016 09:03:08 +0000 (10:03 +0100)]
tests: use ceph-jewel branch for s3tests

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge remote-tracking branch 'ceph/jewel-next' into jewel
Loic Dachary [Wed, 21 Dec 2016 23:18:11 +0000 (00:18 +0100)]
Merge remote-tracking branch 'ceph/jewel-next' into jewel

8 years agoMerge pull request #12591 from jtlayton/wip-18308-jewel
jtlayton [Wed, 21 Dec 2016 14:18:18 +0000 (09:18 -0500)]
Merge pull request #12591 from jtlayton/wip-18308-jewel

Clear setuid bits on ownership changes

8 years agoMerge branch 'jewel' into wip-18308-jewel 12591/head
jtlayton [Tue, 20 Dec 2016 20:36:39 +0000 (15:36 -0500)]
Merge branch 'jewel' into wip-18308-jewel

8 years agoMerge pull request #12592 from jtlayton/wip-18307-jewel
jtlayton [Tue, 20 Dec 2016 20:35:54 +0000 (15:35 -0500)]
Merge pull request #12592 from jtlayton/wip-18307-jewel

Fix mount root for ceph_mount users and change tarball format

8 years agoceph_disk: fix a jewel checkin test break 12592/head
Jeff Layton [Tue, 20 Dec 2016 19:44:04 +0000 (14:44 -0500)]
ceph_disk: fix a jewel checkin test break

Silly python:

    ceph_disk/main.py:173:1: E305 expected 2 blank lines after class or function definition, found 1
    ceph_disk/main.py:5011:1: E305 expected 2 blank lines after class or function definition, found 1

Signed-off-by: Jeff Layton <jlayton@redhat.com>
8 years agoautomake: convert to tar-pax
Jeff Layton [Tue, 20 Dec 2016 16:54:25 +0000 (11:54 -0500)]
automake: convert to tar-pax

We hit some recent build issues with the merge of ceph-qa-suite into
the main repo. The ustar format barfs on >100 character symlink
paths.

Convert to using "tar-pax" which should make it use the posix format.
Any build machine that we're reasonably targeting should support it.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
8 years agoclient: drop setuid/setgid bits on ownership change
Jeff Layton [Tue, 20 Dec 2016 13:17:21 +0000 (08:17 -0500)]
client: drop setuid/setgid bits on ownership change

When we hold exclusive auth caps, then the client is responsible for
handling changes to the mode. Make sure we remove any setuid/setgid
bits on an ownership change.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit 18d2499d6c85a10b4b54f3b8c335cddf86c4588f)

8 years agomds: clear setuid/setgid bits on ownership changes
Jeff Layton [Tue, 20 Dec 2016 13:16:43 +0000 (08:16 -0500)]
mds: clear setuid/setgid bits on ownership changes

If we get a ownership change, POSIX mandates that you clear the
setuid and setgid bits unless you are "appropriately privileged", in
which case the OS is allowed to leave them intact.

Linux however always clears those bits, regardless of the process
privileges, as that makes it simpler to close some potential races.
Have ceph do the same.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit 6da72500882d9749cb2be6eaa2568e6fe6e5ff4d)

8 years agoclient: set metadata["root"] from mount method when it's called with a pathname
Jeff Layton [Tue, 20 Dec 2016 13:07:23 +0000 (08:07 -0500)]
client: set metadata["root"] from mount method when it's called with a pathname

Currently, we only set the root properly config file or the
--client_metadata command line option. If a userland client program
tries to call ceph_mount with a pathname, it's not being properly
set.

Since we already hold the mutex, we can just update it directly.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit 9f8810008c82eebe6e354e7e321e33a3dcba8407)

8 years agoMerge pull request #12454 from liewegas/qa-suite-jewel
Sage Weil [Wed, 14 Dec 2016 17:39:56 +0000 (11:39 -0600)]
Merge pull request #12454 from liewegas/qa-suite-jewel

jewel: merge ceph-qa-suite

8 years agomerge ceph-qa-suite 12454/head
Sage Weil [Wed, 14 Dec 2016 17:29:59 +0000 (11:29 -0600)]
merge ceph-qa-suite

8 years agomove ceph-qa-suite dirs into qa/
Sage Weil [Wed, 14 Dec 2016 17:29:55 +0000 (11:29 -0600)]
move ceph-qa-suite dirs into qa/

8 years agoRevert "tasks/workunit.py: depth 1 clone"
Sage Weil [Wed, 14 Dec 2016 17:27:58 +0000 (12:27 -0500)]
Revert "tasks/workunit.py: depth 1 clone"

This reverts commit e6f61ea9f19d0f1fad4a6547775fa80616eeeb89.

8 years agotasks/workunit.py: depth 1 clone
Sage Weil [Wed, 14 Dec 2016 17:19:44 +0000 (12:19 -0500)]
tasks/workunit.py: depth 1 clone

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

8 years agotasks/workunit: remove kludge to use git.ceph.com
Sage Weil [Wed, 14 Dec 2016 17:18:29 +0000 (12:18 -0500)]
tasks/workunit: remove kludge to use git.ceph.com

This was hard-coded to ceph.git (almost) and breaks when
you specify --ceph-repo.  Remove it entirely.  We'll see if
github.com is better at handling our load than it used to
be!

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

8 years agotasks/ceph: restore context of osd mount path before mkfs
Kefu Chai [Fri, 9 Dec 2016 18:36:52 +0000 (02:36 +0800)]
tasks/ceph: restore context of osd mount path before mkfs

all newly created files and directories under the mount dir inherit the
SELinux type of their parent directory. so we need to set it before
mkfs.

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

8 years ago10.2.5 v10.2.5
Jenkins Build Slave User [Fri, 9 Dec 2016 20:08:24 +0000 (20:08 +0000)]
10.2.5

8 years agoMerge pull request #11865 from dachary/wip-17710-jewel
Yehuda Sadeh [Thu, 8 Dec 2016 19:22:16 +0000 (11:22 -0800)]
Merge pull request #11865 from dachary/wip-17710-jewel

jewel: multisite: race between ReadSyncStatus and InitSyncStatus leads to EIO errors

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoMerge pull request #12376 from liewegas/wip-msgr-eagain-loop-jewel
Samuel Just [Thu, 8 Dec 2016 15:55:27 +0000 (07:55 -0800)]
Merge pull request #12376 from liewegas/wip-msgr-eagain-loop-jewel

msg/simple/Pipe: avoid returning 0 on poll timeout

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agomsg/simple/Pipe: avoid returning 0 on poll timeout 12376/head
Sage Weil [Thu, 8 Dec 2016 00:25:55 +0000 (18:25 -0600)]
msg/simple/Pipe: avoid returning 0 on poll timeout

If poll times out it will return 0 (no data to read on socket).  In
165e5abdbf6311974d4001e43982b83d06f9e0cc we changed tcp_read_wait from
returning -1 to returning -errno, which means we return 0 instead of -1
in this case.

This makes tcp_read() get into an infinite loop by repeatedly trying to
read from the socket and getting EAGAIN.

Fix by explicitly checking for a 0 return from poll(2) and returning
EAGAIN in that case.

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

8 years agoMerge pull request #12033 from dachary/wip-17926-jewel
Loic Dachary [Tue, 6 Dec 2016 14:54:45 +0000 (15:54 +0100)]
Merge pull request #12033 from dachary/wip-17926-jewel

jewel: ceph-disk --dmcrypt create must not require admin key

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #11968 from ddiss/jewel_next_flush_evict_snaps
Loic Dachary [Tue, 6 Dec 2016 08:47:07 +0000 (09:47 +0100)]
Merge pull request #11968 from ddiss/jewel_next_flush_evict_snaps

jewel: tools: snapshotted RBD extent objects can't be manually evicted from a cache tier

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #12151 from dachary/wip-18011-jewel
Loic Dachary [Tue, 6 Dec 2016 08:46:01 +0000 (09:46 +0100)]
Merge pull request #12151 from dachary/wip-18011-jewel

jewel: test fails due to The UNIX domain socket path

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #12296 from SUSE/wip-18133-jewel
Loic Dachary [Tue, 6 Dec 2016 08:45:26 +0000 (09:45 +0100)]
Merge pull request #12296 from SUSE/wip-18133-jewel

jewel: build/ops: fix undefined crypto references with --with-xio

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years ago10.2.4 v10.2.4
Jenkins Build Slave User [Mon, 5 Dec 2016 22:15:20 +0000 (22:15 +0000)]
10.2.4

8 years agoMerge pull request #11997 from Abhishekvrshny/wip-17876-jewel
Sage Weil [Mon, 5 Dec 2016 19:01:55 +0000 (14:01 -0500)]
Merge pull request #11997 from Abhishekvrshny/wip-17876-jewel

jewel: osd: update_log_missing does not order correctly with osd_ops

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11944 from SUSE/wip-17866-jewel
Sage Weil [Mon, 5 Dec 2016 19:01:03 +0000 (14:01 -0500)]
Merge pull request #11944 from SUSE/wip-17866-jewel

jewel: osd: Add config option to disable new scrubs during recovery

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11672 from linuxbox2/jewel-17663
Yehuda Sadeh [Mon, 5 Dec 2016 18:09:30 +0000 (10:09 -0800)]
Merge pull request #11672 from linuxbox2/jewel-17663

jewel: rgw_rest_s3:  apply missed base64 try-catch

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoMerge pull request #11953 from SUSE/wip-17885-jewel
Loic Dachary [Mon, 5 Dec 2016 17:47:28 +0000 (18:47 +0100)]
Merge pull request #11953 from SUSE/wip-17885-jewel

jewel: test: temporarily disable fork()'ing tests

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #11884 from SUSE/wip-17754-jewel
Loic Dachary [Mon, 5 Dec 2016 16:39:50 +0000 (17:39 +0100)]
Merge pull request #11884 from SUSE/wip-17754-jewel

jewel: ceph-create-keys loops forever

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #11529 from SUSE/wip-17600-jewel
Loic Dachary [Mon, 5 Dec 2016 16:38:50 +0000 (17:38 +0100)]
Merge pull request #11529 from SUSE/wip-17600-jewel

jewel: common: Improve linux dcache hash algorithm

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #12167 from liewegas/wip-osdmap-encoding-jewel
Loic Dachary [Mon, 5 Dec 2016 13:50:23 +0000 (14:50 +0100)]
Merge pull request #12167 from liewegas/wip-osdmap-encoding-jewel

jewel: osd: condition OSDMap encoding on features

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #1290 from SUSE/wip-18014-jewel
Nathan Cutler [Sun, 4 Dec 2016 10:46:45 +0000 (11:46 +0100)]
Merge pull request #1290 from SUSE/wip-18014-jewel

thrashosds: try ceph-objectstore-tool for 10 minutes

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agothrashosds: try ceph-objectstore-tool for 10 minutes
Nathan Cutler [Thu, 24 Nov 2016 10:25:35 +0000 (11:25 +0100)]
thrashosds: try ceph-objectstore-tool for 10 minutes

If ceph-objectstore-tool binary is not present, it's likely because we're in
the middle of an upgrade. Do not try to run the binary until we verify that
it's really present. If it is absent, spend up to 10 minutes waiting for it to
appear.

Before this patch there was quite a large window for a race to occur. This
patch doesn't entirely eliminate it, but drastically reduces it.

Fixes: http://tracker.ceph.com/issues/18014
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 862b47faac1fc9f05ee3322ee4b65cf3d3d666c5)

8 years agobuild/ops: fix undefined crypto references with --with-xio 12296/head
Nathan Cutler [Sat, 3 Dec 2016 12:29:56 +0000 (13:29 +0100)]
build/ops: fix undefined crypto references with --with-xio

Only with --with-xio, RPM build fails due to undefined references to various
symbols starting with "PK11_" in ./.libs/libcommon.a(Crypto.o) in several
of the unit tests.

Fixes: http://tracker.ceph.com/issues/18133
Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #12067 from SUSE/wip-17953-jewel
Loic Dachary [Sat, 3 Dec 2016 09:57:18 +0000 (10:57 +0100)]
Merge pull request #12067 from SUSE/wip-17953-jewel

jewel: mon: OSDMonitor: only reject MOSDBoot based on up_from if inst matches

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoMerge pull request #1297 from ceph/wip-14.04
Zack Cerza [Fri, 2 Dec 2016 20:25:32 +0000 (13:25 -0700)]
Merge pull request #1297 from ceph/wip-14.04

suites/rados: s/trusty/"14.04"/

8 years agoOSDMonitor: only reject MOSDBoot based on up_from if inst matches 12067/head
Samuel Just [Mon, 14 Nov 2016 19:50:23 +0000 (11:50 -0800)]
OSDMonitor: only reject MOSDBoot based on up_from if inst matches

If the osd actually restarts, there is no guarrantee that the epoch will
advance past up_from.  If the inst is different, it can't really be a
dup.  At worst, it might be a queued MOSDBoot from a previous inst, but
in that case, the real inst would see itself marked up, and then back
down causing it to try booting again.

Fixes: http://tracker.ceph.com/issues/17899
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 033ad5b46c0492134e72a8372e44e3ef1358d2df)

8 years agoMerge pull request #12207 from jdurgin/wip-librados-setxattr-overload-jewel
Josh Durgin [Fri, 2 Dec 2016 16:16:27 +0000 (08:16 -0800)]
Merge pull request #12207 from jdurgin/wip-librados-setxattr-overload-jewel

librados: remove new setxattr overload to avoid breaking the C++ ABI

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agosuites/rados: s/trusty/"14.04"/
Sage Weil [Fri, 2 Dec 2016 14:37:09 +0000 (09:37 -0500)]
suites/rados: s/trusty/"14.04"/

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #1296 from dachary/wip-ceph-coverage-jewel
Loic Dachary [Fri, 2 Dec 2016 10:42:34 +0000 (11:42 +0100)]
Merge pull request #1296 from dachary/wip-ceph-coverage-jewel

upgrade: ceph-test is needed for ceph-coverage

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
8 years agoupgrade/infernalis-client-x: ceph-test is needed for ceph-coverage
Loic Dachary [Fri, 2 Dec 2016 09:32:42 +0000 (10:32 +0100)]
upgrade/infernalis-client-x: ceph-test is needed for ceph-coverage

Do not exclude the ceph-test package otherwise the ceph-coverage
executable is not installed.

Fixes: http://tracker.ceph.com/issues/16506
Signed-off-by: Loic Dachary <loic@dachary.org>
8 years agoupgrade: ceph-test is needed for ceph-coverage
Loic Dachary [Fri, 2 Dec 2016 09:27:25 +0000 (10:27 +0100)]
upgrade: ceph-test is needed for ceph-coverage

Do not exclude the ceph-test package otherwise the ceph-coverage
executable is not installed.

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

8 years agoMerge pull request #12267 from dachary/wip-17904-jewel
Loic Dachary [Fri, 2 Dec 2016 09:01:39 +0000 (10:01 +0100)]
Merge pull request #12267 from dachary/wip-17904-jewel

 jewel: Error EINVAL: removing mon.a at 172.21.15.16:6789/0, there will be 1 monitors

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoMerge pull request #1284 from ceph/jewel-name-limits
Sage Weil [Thu, 1 Dec 2016 21:57:20 +0000 (16:57 -0500)]
Merge pull request #1284 from ceph/jewel-name-limits

drop broken name length config args

8 years agoMerge pull request #1292 from ceph/jewel-avoid-xenial
Sage Weil [Thu, 1 Dec 2016 21:56:55 +0000 (16:56 -0500)]
Merge pull request #1292 from ceph/jewel-avoid-xenial

rados: avoid xenial for upgrade tests

8 years agomon: MonmapMonitor: drop unnecessary 'goto' statements 12267/head
Joao Eduardo Luis [Wed, 2 Nov 2016 15:38:36 +0000 (15:38 +0000)]
mon: MonmapMonitor: drop unnecessary 'goto' statements

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
(cherry picked from commit 20dcb597e35e6961db81831facefbe22cecddec3)

8 years agomon: MonmapMonitor: return success when monitor will be removed
Joao Eduardo Luis [Wed, 2 Nov 2016 15:33:52 +0000 (15:33 +0000)]
mon: MonmapMonitor: return success when monitor will be removed

Fixes: http://tracker.ceph.com/issues/17725
Signed-off-by: Joao Eduardo Luis <joao@suse.de>
(cherry picked from commit c9d46cfbf2512bc3495c6901de2b8f711bef9bae)

8 years agoMerge pull request #11999 from Abhishekvrshny/wip-17904-jewel
Samuel Just [Thu, 1 Dec 2016 19:50:35 +0000 (11:50 -0800)]
Merge pull request #11999 from Abhishekvrshny/wip-17904-jewel

jewel: Error EINVAL: removing mon.a at 172.21.15.16:6789/0, there will be 1 monitors

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoMerge pull request #12001 from dachary/wip-17915-jewel
Samuel Just [Thu, 1 Dec 2016 19:08:04 +0000 (11:08 -0800)]
Merge pull request #12001 from dachary/wip-17915-jewel

jewel: filestore: can get stuck in an unbounded loop during scrub

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoMerge pull request #12174 from SUSE/wip-18025-jewel
Yehuda Sadeh [Thu, 1 Dec 2016 18:55:01 +0000 (10:55 -0800)]
Merge pull request #12174 from SUSE/wip-18025-jewel

rgw: don't store empty chains in gc

8 years agoMerge pull request #11758 from Abhishekvrshny/wip-17784-jewel
Yehuda Sadeh [Thu, 1 Dec 2016 18:46:30 +0000 (10:46 -0800)]
Merge pull request #11758 from Abhishekvrshny/wip-17784-jewel

jewel: osd crashes when radosgw-admin bi list --max-entries=1 command runing

8 years agoupgrade/client-upgrade: correct distros/ location
Sage Weil [Thu, 1 Dec 2016 15:03:49 +0000 (10:03 -0500)]
upgrade/client-upgrade: correct distros/ location

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoupgrade/client-upgrade: fix distro symlinks
Sage Weil [Thu, 1 Dec 2016 14:53:53 +0000 (09:53 -0500)]
upgrade/client-upgrade: fix distro symlinks

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoupgrade/client-upgrade: specify centos or trusty (not xenial)
Sage Weil [Wed, 30 Nov 2016 16:55:45 +0000 (11:55 -0500)]
upgrade/client-upgrade: specify centos or trusty (not xenial)

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agorados: avoid ubuntu xenial on upgrade tests
Sage Weil [Wed, 30 Nov 2016 16:00:39 +0000 (11:00 -0500)]
rados: avoid ubuntu xenial on upgrade tests

Not all of the older package builds are present for xenial.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #1152 from ceph/wip-objecstore
Sage Weil [Wed, 30 Nov 2016 02:54:15 +0000 (21:54 -0500)]
Merge pull request #1152 from ceph/wip-objecstore

rados/objectstore/objectstore.yaml: skip bluestore tests

8 years agoMerge pull request #1288 from dachary/wip-shec-upgrade-jewel
Sage Weil [Tue, 29 Nov 2016 15:36:22 +0000 (10:36 -0500)]
Merge pull request #1288 from dachary/wip-shec-upgrade-jewel

upgrade/hammer-x: verify shec before the full upgrade

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoupgrade/hammer-x: verify shec before the full upgrade
Loic Dachary [Tue, 29 Nov 2016 08:49:15 +0000 (09:49 +0100)]
upgrade/hammer-x: verify shec before the full upgrade

The hammer-x/stress-split-erasure-code upgrade sequence comes from
hammer-x/stress-split and was modified to fully upgrade the cluster. It
previously upgraded only half of it. Verifying that the shec plugin is
not available and that trying to set it does not crash the OSD or the
MON must be tried before the upgrade is complete.

Signed-off-by: Loic Dachary <loic@dachary.org>
8 years agolibrados: remove new setxattr overload to avoid breaking the C++ ABI 12207/head
Josh Durgin [Tue, 29 Nov 2016 06:06:56 +0000 (22:06 -0800)]
librados: remove new setxattr overload to avoid breaking the C++ ABI

Fixes: http://tracker.ceph.com/issues/18058
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit b8ff781ddcf737882163cf56d7c9b11e815fb699)

Conflicts:
src/include/rados/librados.hpp (trivial namespace change in removed line)

8 years agoMerge pull request #1287 from ceph/jewel-failed-to-encode
Samuel Just [Mon, 28 Nov 2016 21:59:47 +0000 (13:59 -0800)]
Merge pull request #1287 from ceph/jewel-failed-to-encode

upgrade/hammer-x: encoding fixes (jewel)

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agocrush: condition latest tunable encoding on features 12167/head
Sage Weil [Wed, 23 Nov 2016 19:15:50 +0000 (14:15 -0500)]
crush: condition latest tunable encoding on features

This avoids throwing hammer OSDMap encodings off.

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

8 years agocrush/CrushWrapper: encode with features
Sage Weil [Mon, 28 Nov 2016 19:35:53 +0000 (14:35 -0500)]
crush/CrushWrapper: encode with features

No behavior change yet; just fixing callers.

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

[Updated write_file to use all feaetures]
[Updated OSDMonitor.cc to use mon->quorum_features instead of the
 mon->get_quorum_con_featuers() helper]
[trivial conflict from removed write_file and read_file]

Conflicts:
src/crush/CrushWrapper.h
src/mgr/PyModules.cc
src/mon/OSDMonitor.cc
src/tools/ceph_monstore_tool.cc

8 years agocrush/CrushWrapper: drop unused 'lean' encode() argument
Sage Weil [Mon, 28 Nov 2016 19:35:24 +0000 (14:35 -0500)]
crush/CrushWrapper: drop unused 'lean' encode() argument

No callers, no users.

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

Conflicts:
src/crush/CrushWrapper.h

[trivial conflict due to removal of write_file and read_file]

8 years agoupgrade/hammer-x/stress-split-*: disable sighup injection
Sage Weil [Mon, 28 Nov 2016 16:56:02 +0000 (11:56 -0500)]
upgrade/hammer-x/stress-split-*: disable sighup injection

We already did this for stress-split; do the same
here.  It triggers a File closed exception when the greenlet
is joined.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoupgrade/hammer-x/parallel: white 'failed to encode'
Sage Weil [Mon, 28 Nov 2016 15:29:40 +0000 (10:29 -0500)]
upgrade/hammer-x/parallel: white 'failed to encode'

The problem here has nothing to do with osdmap
encoding, but that hammer -> jewel makes the systemd
transition and installing the package starts
the mons.. before the osds.  I'm not sure what
the workaround for that is but the osdmap issue
appears okay, so ignore this for now.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #1285 from ceph/jewel-failed-to-encode
Yuri Weinstein [Sun, 27 Nov 2016 19:06:14 +0000 (11:06 -0800)]
Merge pull request #1285 from ceph/jewel-failed-to-encode

upgrade/hammer-x: do not whitelist 'failed to encode map'

8 years agoupgrade/hammer-x/parallel: upgrade osds first
Sage Weil [Sat, 26 Nov 2016 23:31:23 +0000 (18:31 -0500)]
upgrade/hammer-x/parallel: upgrade osds first

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoupgrade/hammer-x: do not whitelist 'failed to encode map'
Sage Weil [Sat, 26 Nov 2016 23:37:37 +0000 (18:37 -0500)]
upgrade/hammer-x: do not whitelist 'failed to encode map'

Well, on parallel.  For the others, keep it in
place because we don't upgrade osds first (we are testing
other things).

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agodrop broken name length config args
Sage Weil [Thu, 5 May 2016 13:07:36 +0000 (09:07 -0400)]
drop broken name length config args

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

8 years agorgw: don't store empty chains in gc 12174/head
Yehuda Sadeh [Mon, 14 Nov 2016 18:22:03 +0000 (10:22 -0800)]
rgw: don't store empty chains in gc

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

8 years agoupgrade/hammer-x: fix symlinks
Sage Weil [Wed, 23 Nov 2016 21:40:38 +0000 (16:40 -0500)]
upgrade/hammer-x: fix symlinks

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd/osd_types: encode pg_pool_t like hammer if features indicate hammer
Sage Weil [Wed, 23 Nov 2016 18:51:59 +0000 (13:51 -0500)]
osd/osd_types: encode pg_pool_t like hammer if features indicate hammer

If the target features are missing the new OSDOp encoding, the
first feature we added post-hammer, encode like hammer.

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

8 years agoosd/osd_types: conditional pg_pool_t encoding
Sage Weil [Wed, 23 Nov 2016 18:48:35 +0000 (13:48 -0500)]
osd/osd_types: conditional pg_pool_t encoding

Align this with decode.

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

8 years agoMerge pull request #1273 from ceph/wip-whitelist-crc
Tamilarasi Muthamizhan [Wed, 23 Nov 2016 19:21:53 +0000 (11:21 -0800)]
Merge pull request #1273 from ceph/wip-whitelist-crc

whitelist CRC mismatch

8 years agoMerge pull request #1281 from ceph/wip-jewel-debug-fuse
Sage Weil [Wed, 23 Nov 2016 14:38:08 +0000 (09:38 -0500)]
Merge pull request #1281 from ceph/wip-jewel-debug-fuse

upgrade/hammer-x: debug mds

8 years agoupgrade/hammer-x: debug mds
Sage Weil [Wed, 23 Nov 2016 14:37:49 +0000 (09:37 -0500)]
upgrade/hammer-x: debug mds

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #1280 from ceph/wip-jewel-debug-fuse
Sage Weil [Wed, 23 Nov 2016 14:37:00 +0000 (09:37 -0500)]
Merge pull request #1280 from ceph/wip-jewel-debug-fuse

upgrade/hammer-x: debug client

8 years agoupgrade/hammer-x: debug client
Sage Weil [Wed, 23 Nov 2016 14:36:19 +0000 (09:36 -0500)]
upgrade/hammer-x: debug client

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11855 from dachary/wip-17472-jewel
Loic Dachary [Wed, 23 Nov 2016 08:27:54 +0000 (09:27 +0100)]
Merge pull request #11855 from dachary/wip-17472-jewel

jewel: rpm: /etc/ceph/rbdmap is packaged with executable access rights

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #11660 from Abhishekvrshny/wip-17601-jewel
Loic Dachary [Wed, 23 Nov 2016 08:25:15 +0000 (09:25 +0100)]
Merge pull request #11660 from Abhishekvrshny/wip-17601-jewel

jewel: mon: health does not report pgs stuck in more than one state

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agotests: save 9 characters for asok paths 12151/head
Loic Dachary [Fri, 18 Nov 2016 07:06:02 +0000 (08:06 +0100)]
tests: save 9 characters for asok paths

For vstart.sh powered tests, save 9 characters in the path name
by replacing testdir/test- with td/t-

60 characters imposed by jenkins
9 characters for src/test
5 characters for td/t-

33 left (instead of 24) for the test to create asok such as out/client.admin.25327.asok

Moving these files outside of the build directory is a bad idea because
tests should only create/use files within the builddir and not write
outside of this directory. Doing so would make things more complicated
for cleanup in case the test fail and create other problems as a
consequence (filling out disk space, conflicting directories between
runs etc.).

For ceph-helpers.sh tests replace testdir with td, saving 5 characters.
This is not strictly necessary but keeps the directory names consistent:
if the developer wants to get rid of all the test leftovers, it is
enough to remove the a single directory: td.

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

Conflicts:
.gitignore : test directories are not ignored in jewel
src/test/vstart_wrapper.sh : trivial context resolution

8 years agoMerge pull request #1272 from ceph/wip-rgw-sync-agent-retry-jewel
Loic Dachary [Tue, 22 Nov 2016 17:42:30 +0000 (18:42 +0100)]
Merge pull request #1272 from ceph/wip-rgw-sync-agent-retry-jewel

jewel: rgw: fix some races with radosgw and radosgw-agent startup

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agotasks.rgw: 'time' imported but unused
Owen Synge [Thu, 17 Nov 2016 10:37:59 +0000 (11:37 +0100)]
tasks.rgw: 'time' imported but unused

flake8 was failing.

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit ef1d2a6aabe91282e28dbb6200fb7c2fab816720)

8 years agoRestart OSDs that belong to first node only
Tamil Muthamizhan [Fri, 18 Nov 2016 21:43:30 +0000 (13:43 -0800)]
Restart OSDs that belong to first node only

Restart only first half osds as only the first node
is upgraded

Signed-off-by: Tamil Muthamizhan <tmuthami@redhat.com>
8 years agoThis is triggering failures like
Tamil Muthamizhan [Fri, 18 Nov 2016 21:35:19 +0000 (13:35 -0800)]
This is triggering failures like

2016-11-18T01:17:08.865 INFO:tasks.ceph.osd.3:Stopping old one...
2016-11-18T01:17:08.865 DEBUG:tasks.ceph.osd.3:waiting for process to exit
2016-11-18T01:17:08.865 INFO:teuthology.orchestra.run:waiting for 300
2016-11-18T01:17:09.199 INFO:tasks.thrashosds.thrasher:Traceback (most recent call last):
  File "/home/teuthworker/src/ceph-qa-suite_wip-whitelist-crc/tasks/ceph_manager.py", line 660, in wrapper
    return func(self)
  File "/home/teuthworker/src/ceph-qa-suite_wip-whitelist-crc/tasks/ceph_manager.py", line 677, in do_sighup
    self.ceph_manager.signal_osd(osd, signal.SIGHUP, silent=True)
  File "/home/teuthworker/src/ceph-qa-suite_wip-whitelist-crc/tasks/ceph_manager.py", line 1865, in signal_osd
    self.cluster).signal(sig, silent=silent)
  File "/home/teuthworker/src/teuthology_master/teuthology/orchestra/daemon.py", line 111, in signal
    self.proc.stdin.write(struct.pack('!b', sig))
  File "/home/teuthworker/src/teuthology_master/virtualenv/local/lib/python2.7/site-packages/paramiko/file.py", line 377, in write
    raise IOError('File is closed')
IOError: File is closed

so trying to avoid this error.

Signed-off-by: Tamil Muthamizhan <tmuthami@redhat.com>
8 years agowhitelist CRC mismatch
Tamil Muthamizhan [Thu, 17 Nov 2016 21:41:32 +0000 (13:41 -0800)]
whitelist CRC mismatch

whitelisted CRC mismatch and added upgrade for second
half of the cluster

Signed-off-by: Tamil Muthamizhan <tmuthami@redhat.com>
8 years agorgw: remove unnecessary sleeps
Casey Bodley [Tue, 15 Nov 2016 19:42:23 +0000 (14:42 -0500)]
rgw: remove unnecessary sleeps

remove the sleeps that were added to address radosgw startup races

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 3e68bfdbb29e933edb06f73c88eed176ffacc2e3)

8 years agorgw: start_rgw() polls gateway until it accepts connections
Casey Bodley [Tue, 15 Nov 2016 18:44:27 +0000 (13:44 -0500)]
rgw: start_rgw() polls gateway until it accepts connections

resolves various races between radosgw startup and further operations -
both within the rgw task itself (such as the 'radosgw-admin realm pull'),
and in later tasks

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

8 years agorgw: add retry/backoff to sync agent requests
Casey Bodley [Tue, 15 Nov 2016 16:24:25 +0000 (11:24 -0500)]
rgw: add retry/backoff to sync agent requests

resolves an issue where startup of the radosgw-agent races with the
requests we send to it to run sync. uses the requests package with
urllib3 to add retry with backoff to these requests

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

8 years agomon,ceph-disk: add lockbox permissions to bootstrap-osd 12033/head
Loic Dachary [Tue, 15 Nov 2016 16:16:37 +0000 (17:16 +0100)]
mon,ceph-disk: add lockbox permissions to bootstrap-osd

ceph-disk --dmcrypt needs to put a config-key and authorize
the OSD to get it back. The corresponding permissions are
added to the bootstrap-osd profile in the monitor.

When preparing the OSD lockbox, use the bootstrap-osd profile instead of
implicitly requiring admin permissions to perform the initial config-key
and auth get-or-create operations.

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

8 years agoMerge pull request #1266 from ceph/wip-add-point-jewel
Yuri Weinstein [Wed, 16 Nov 2016 18:06:11 +0000 (10:06 -0800)]
Merge pull request #1266 from ceph/wip-add-point-jewel

Added /upgrade/jewel-x/point-to-point-x

8 years agoAdded /upgrade/jewel-x/point-to-point-x
Yuri Weinstein [Tue, 15 Nov 2016 21:39:25 +0000 (21:39 +0000)]
Added /upgrade/jewel-x/point-to-point-x

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
8 years agoMerge pull request #1265 from ceph/wip-dont-whitelist
Yuri Weinstein [Tue, 15 Nov 2016 22:34:40 +0000 (14:34 -0800)]
Merge pull request #1265 from ceph/wip-dont-whitelist

DO NOT whitelist CRC mismatch

8 years agoDO NOT whitelist CRC mismatch
Tamil Muthamizhan [Tue, 15 Nov 2016 22:40:29 +0000 (14:40 -0800)]
DO NOT whitelist CRC mismatch

Signed-off-by: Tamil Muthamizhan <tmuthami@redhat.com>
8 years agoMerge pull request #1264 from ceph/jewel-osds-before-mon
Tamilarasi Muthamizhan [Tue, 15 Nov 2016 22:13:57 +0000 (14:13 -0800)]
Merge pull request #1264 from ceph/jewel-osds-before-mon

Jewel osds before mon

8 years agoos/filestore/HashIndex: fix list_by_hash_* termination on reaching end 12001/head
Sage Weil [Thu, 10 Nov 2016 18:56:24 +0000 (13:56 -0500)]
os/filestore/HashIndex: fix list_by_hash_* termination on reaching end

If we set *next to max, then the caller (a few lines up) doesn't terminate
the loop and will keep trying to list objects in every following hash
dir until it reaches the end of the collection.  In fact, if we have an
end bound we will never to an efficient listing unless we hit the max
first.

For one user, this was causing OSD suicides when scrub ran because it
wasn't able to list all objects before the timeout.  In general, this would
cause scrub to stall a PG for a long time and slow down requests.

Broken by refactor in 921c4586f165ce39c17ef8b579c548dc8f6f4500.

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

8 years agomon: MonmapMonitor: drop unnecessary 'goto' statements 11999/head
Joao Eduardo Luis [Wed, 2 Nov 2016 15:38:36 +0000 (15:38 +0000)]
mon: MonmapMonitor: drop unnecessary 'goto' statements

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
(cherry picked from commit 20dcb597e35e6961db81831facefbe22cecddec3)

8 years agomon: MonmapMonitor: return success when monitor will be removed
Joao Eduardo Luis [Wed, 2 Nov 2016 15:33:52 +0000 (15:33 +0000)]
mon: MonmapMonitor: return success when monitor will be removed

Fixes: http://tracker.ceph.com/issues/17725
Signed-off-by: Joao Eduardo Luis <joao@suse.de>
(cherry picked from commit c9d46cfbf2512bc3495c6901de2b8f711bef9bae)