]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agorpm: Restore /var/run/ceph context manually 8938/head
Boris Ranto [Mon, 23 May 2016 15:06:19 +0000 (17:06 +0200)]
rpm: Restore /var/run/ceph context manually

The fixfiles command won't fix label for /var/run/ceph (/run is probably
excluded from relabel), we need to restore the context manually.

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

9 years agorpm: Mute semodule in postun script
Boris Ranto [Fri, 20 May 2016 06:09:42 +0000 (08:09 +0200)]
rpm: Mute semodule in postun script

Currently, we don't mute the semodule output in postun script. This
results in the following message when removing ceph-selinux package:

libsemanage.semanage_direct_remove_key: Removing last ceph module (no
other ceph module exists at another priority).

The fix is to simply mute the output of the command.

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

9 years agoinstall-deps.sh: systemd-rpm-macros must be installed on SUSE
Nathan Cutler [Wed, 27 Apr 2016 09:13:06 +0000 (11:13 +0200)]
install-deps.sh: systemd-rpm-macros must be installed on SUSE

Otherwise the script breaks.

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

9 years agorpm: Drop SELinux priority setting
Boris Ranto [Tue, 10 May 2016 16:20:13 +0000 (18:20 +0200)]
rpm: Drop SELinux priority setting

Older versions of semodule binary that are in Centos/RHEL do not
support priority setting, dropping it.

Fixes: #15822
Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit 7e606f29f499eac83ecb7053ea6874fcfd092924)

9 years agorpm: Fix SELinux relabel on fedora
Boris Ranto [Wed, 4 May 2016 07:09:47 +0000 (09:09 +0200)]
rpm: Fix SELinux relabel on fedora

The SELinux userspace utilities stopped providing versions when they
switched to CIL language. We need to use a different technique to
relabel the files.

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

9 years agoTest-enable XIO messenger and IB/RDMA support
Nathan Cutler [Tue, 12 Apr 2016 13:33:45 +0000 (15:33 +0200)]
Test-enable XIO messenger and IB/RDMA support

Fixes: http://tracker.ceph.com/issues/15472
Signed-off-by: Lars Marowsky-Bree <lmb@suse.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit d4b74c56d6cbb2c6852bf66f2f34b8a877d7a9ef)

9 years agorpm: do a full make check when --with-tests is given
Nathan Cutler [Thu, 28 Apr 2016 17:29:00 +0000 (19:29 +0200)]
rpm: do a full make check when --with-tests is given

The check-local target tests the CLI tools only.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit e1514809ae3d2df08a0c47882f9b3bd0ed68d200)

9 years agorpm: drop sysvinit bits from relabel_files function
Nathan Cutler [Tue, 26 Apr 2016 15:03:28 +0000 (17:03 +0200)]
rpm: drop sysvinit bits from relabel_files function

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 20df58799a4853ed3798501176988ffaf888936b)

9 years agorpm: replace literal paths with RPM macros
Nathan Cutler [Sun, 11 Oct 2015 16:27:45 +0000 (18:27 +0200)]
rpm: replace literal paths with RPM macros

The only place we should write out literal paths is in the RPM scriptlets,
and there only for things that are not installed by this package.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit e0346b36fc0e6e17c80c047b13997448ccf1c76e)

9 years agorpm: drop udev/95-ceph-osd-alt.rules
Nathan Cutler [Sun, 11 Oct 2015 16:05:12 +0000 (18:05 +0200)]
rpm: drop udev/95-ceph-osd-alt.rules

This udev rules file was needed on older RHEL platforms, which are
unsupported as of jewel.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit ee4acb31593dd33da99138998fd0f30ebc2f1a6e)

9 years agorpm: global replace $RPM_BUILD_ROOT with %{buildroot}
Nathan Cutler [Sun, 11 Oct 2015 15:20:46 +0000 (17:20 +0200)]
rpm: global replace $RPM_BUILD_ROOT with %{buildroot}

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit bed92b6a86cdef784e89c38952fa779ce5fc5a91)

9 years agorpm: put dependencies in alphabetical order
Nathan Cutler [Sun, 11 Oct 2015 08:37:47 +0000 (10:37 +0200)]
rpm: put dependencies in alphabetical order

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 66042c03df012754215ed848e475f2195ee988a0)

9 years agorpm: drop sysvinit-specific dependencies
Nathan Cutler [Sun, 11 Oct 2015 08:32:46 +0000 (10:32 +0200)]
rpm: drop sysvinit-specific dependencies

Obsolete in jewel and above.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit c655cb896ad10e001b95848f4a4b64dd1ef6984f)

9 years agorpm: move boost-random dependency to appropriate section
Nathan Cutler [Sun, 11 Oct 2015 08:32:05 +0000 (10:32 +0200)]
rpm: move boost-random dependency to appropriate section

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 46b16c19f73d82cc357b16e6201926a3479046f2)

9 years agorpm: move unified python-sphinx build dependency
Nathan Cutler [Sat, 23 Apr 2016 17:57:49 +0000 (19:57 +0200)]
rpm: move unified python-sphinx build dependency

Now that the python-sphinx build dependency is unified, move it
to the proper section of the spec file.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 1d897da861c6134778136fa2b8b33e36c08faff9)

9 years agorpm: drop init-ceph.in-fedora.patch
Nathan Cutler [Sat, 23 Apr 2016 17:41:06 +0000 (19:41 +0200)]
rpm: drop init-ceph.in-fedora.patch

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit e8cf501d0f22c757a0860a0c91dcb1d7a472ed34)

9 years agorpm: drop dead conditionals
Nathan Cutler [Sun, 11 Oct 2015 08:22:37 +0000 (10:22 +0200)]
rpm: drop dead conditionals

This commit drops conditionals that no longer serve any purpose, since
jewel and above do not support the distro versions they are checking for.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 1332fac70e537014b5e03810aa983e2c9210d8dc)

9 years agorpm: drop python-argparse dependency
Nathan Cutler [Sun, 11 Oct 2015 08:18:33 +0000 (10:18 +0200)]
rpm: drop python-argparse dependency

This was only necessary for older (now unsupported) distro versions.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 6c42066d488d03142a56f92cff99d9c29d106214)

9 years agorpm: drop _with_systemd
Nathan Cutler [Sun, 11 Oct 2015 08:02:40 +0000 (10:02 +0200)]
rpm: drop _with_systemd

Ceph versions jewel and above only support systemd.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 2ca6dd250b6a049f27fa17c5e8ca11674acb63f6)

9 years agorpm: drop python_sitelib/sitearch conditional
Nathan Cutler [Sun, 11 Oct 2015 07:43:06 +0000 (09:43 +0200)]
rpm: drop python_sitelib/sitearch conditional

This conditional was required to support older versions of RHEL/CentOS that are
no longer supported in infernalis and above.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 98d52120f89af3e93896d0518dbea4c4f660af48)

9 years agoudev: remove 60-ceph-partuuid-workaround-rules
Sage Weil [Mon, 18 Apr 2016 13:16:02 +0000 (09:16 -0400)]
udev: remove 60-ceph-partuuid-workaround-rules

These were added to get /dev/disk/by-partuuid/ symlinks to work on
wheezy.  They are no longer needed for the supported distros (el7+,
jessie+, trusty+), and they apparently break dm by opening devices they
should not.

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

9 years agorpm: refrain from installing systemd unit files twice
Nathan Cutler [Wed, 20 Apr 2016 15:21:56 +0000 (17:21 +0200)]
rpm: refrain from installing systemd unit files twice

These files are already installed by systemd/Makefile.am

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

9 years agotest/ec: build the libs only when 'make check'
Boris Ranto [Tue, 23 Feb 2016 04:57:14 +0000 (05:57 +0100)]
test/ec: build the libs only when 'make check'

Currently, we are always building the erasure code libraries while we
need them only when 'make check' is run. Moving the test libraries to
check_LTLIBRARIES should fix this for us.

We no longer need to remove the libec libs manually, remove the lines
that do that.

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

9 years agoMerge pull request #9232 from jdurgin/wip-mirror-workunit-jewel
Jason Dillaman [Fri, 20 May 2016 18:57:00 +0000 (14:57 -0400)]
Merge pull request #9232 from jdurgin/wip-mirror-workunit-jewel

jewel: qa/workunits/rbd: fixed rbd_mirror teuthology runtime errors

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoqa/workunits/rbd: fixed rbd_mirror teuthology runtime errors 9232/head
Jason Dillaman [Wed, 18 May 2016 18:17:13 +0000 (14:17 -0400)]
qa/workunits/rbd: fixed rbd_mirror teuthology runtime errors

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

9 years agoMerge pull request #9226 from dillaman/wip-15950
Jason Dillaman [Fri, 20 May 2016 13:02:51 +0000 (09:02 -0400)]
Merge pull request #9226 from dillaman/wip-15950

jewel: rbd-mirror: potential crash during image status update

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9069 from dillaman/fixup-mirror_image_status_list-jewel
Jason Dillaman [Fri, 20 May 2016 13:02:06 +0000 (09:02 -0400)]
Merge pull request #9069 from dillaman/fixup-mirror_image_status_list-jewel

jewel: cls::rbd: mirror_image_status_list returned max 64 items

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agojournal: reset watch step after pruning expired tag 9226/head
Jason Dillaman [Thu, 19 May 2016 14:11:12 +0000 (10:11 -0400)]
journal: reset watch step after pruning expired tag

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

9 years agorbd-mirror: additional debug messages during image replayer start/stop
Jason Dillaman [Wed, 18 May 2016 15:01:22 +0000 (11:01 -0400)]
rbd-mirror: additional debug messages during image replayer start/stop

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

9 years agorbd-mirror: ensure proper handling of status updates during shutdown
Jason Dillaman [Wed, 18 May 2016 04:55:01 +0000 (00:55 -0400)]
rbd-mirror: ensure proper handling of status updates during shutdown

Previously, several shutdown race conditions could occur due to the
use of the async work queue for scheduling updates.

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

9 years agorbd-mirror: track bootstrap state within image status
Jason Dillaman [Wed, 18 May 2016 03:31:02 +0000 (23:31 -0400)]
rbd-mirror: track bootstrap state within image status

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

9 years agorbd-mirror: combine ImageReplayer stopped and uninitialized states
Jason Dillaman [Wed, 18 May 2016 03:25:25 +0000 (23:25 -0400)]
rbd-mirror: combine ImageReplayer stopped and uninitialized states

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

9 years agorbd-mirror: lock ordering issue in status update callback
Jason Dillaman [Tue, 17 May 2016 20:14:42 +0000 (16:14 -0400)]
rbd-mirror: lock ordering issue in status update callback

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

9 years agorbd-mirror: don't unregister asok commands if image replayer start failed
Mykola Golub [Wed, 4 May 2016 12:23:11 +0000 (15:23 +0300)]
rbd-mirror: don't unregister asok commands if image replayer start failed

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit 2fd6fdd3dc9ecb915362f5e3aa8a224210273540)

9 years agorbd-mirror: avoid potential deadlock
Mykola Golub [Wed, 4 May 2016 12:25:04 +0000 (15:25 +0300)]
rbd-mirror: avoid potential deadlock

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit 46bf727d43af4975beeb514630a99d59cfb0a406)

9 years agoMerge pull request #9217 from dillaman/wip-15945
Jason Dillaman [Fri, 20 May 2016 13:01:50 +0000 (09:01 -0400)]
Merge pull request #9217 from dillaman/wip-15945

jewel: journal: live replay might skip entries from previous object set

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoqa/workunits/rbd: rbd-mirror daemon stress test 9217/head
Jason Dillaman [Tue, 17 May 2016 01:17:09 +0000 (21:17 -0400)]
qa/workunits/rbd: rbd-mirror daemon stress test

This test repeatedly runs rbd bench-write, kills the process
randomly to create an unclean journal shutdown, and verifies
that the image content replicates correctly.

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

9 years agojournal: helper method to detect newer tags
Jason Dillaman [Mon, 16 May 2016 22:08:35 +0000 (18:08 -0400)]
journal: helper method to detect newer tags

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

9 years agojournal: skip partially complete tag entries during playback
Jason Dillaman [Sun, 15 May 2016 13:52:41 +0000 (09:52 -0400)]
journal: skip partially complete tag entries during playback

If a journal client does not fully write out its buffered entries
before quiting, replay should skip over all remaining out-of-
sequence entries for the tag.

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

9 years agojournal: close, advance, and open object set ordering
Jason Dillaman [Sat, 14 May 2016 22:58:41 +0000 (18:58 -0400)]
journal: close, advance, and open object set ordering

Flush in-flight appends to open objects before advancing the
active object set.  Additionally, don't start recording to the
new objects until after advancing the active set.

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

9 years agojournal: new ObjectRecorder closed callback
Jason Dillaman [Sat, 14 May 2016 22:13:38 +0000 (18:13 -0400)]
journal: new ObjectRecorder closed callback

The callback will be invoked if there were in-flight appends
when the close was requested.

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

9 years agojournal: do not flag append as full if already known to be full
Jason Dillaman [Fri, 13 May 2016 20:34:44 +0000 (16:34 -0400)]
journal: do not flag append as full if already known to be full

Once an object has overflowed or a close is in-progress, re-attempting
to close the object is not needed since the async process is already
underway.

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

9 years agojournal: delay object overflow event until in-flight appends settled
Jason Dillaman [Fri, 13 May 2016 20:28:50 +0000 (16:28 -0400)]
journal: delay object overflow event until in-flight appends settled

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

9 years agojournal: ignore flush on closed/overflowed object
Jason Dillaman [Fri, 13 May 2016 20:17:37 +0000 (16:17 -0400)]
journal: ignore flush on closed/overflowed object

The journal would be in-progress on transitioning to a new
object recorder in a newer object set.  Once the records
re-attach to the new object player they will automatically
flush.

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

9 years agojournal: implicitly detach future's flush handler on append
Jason Dillaman [Fri, 13 May 2016 20:10:11 +0000 (16:10 -0400)]
journal: implicitly detach future's flush handler on append

If the future is already in-flight, there is no purpose served
by requesting the future be flushed to disk.

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

9 years agojournal: async callback for advancing the active object set
Jason Dillaman [Fri, 13 May 2016 19:22:30 +0000 (15:22 -0400)]
journal: async callback for advancing the active object set

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

9 years agojournal: re-fetch active object before advancing set during replay
Jason Dillaman [Fri, 13 May 2016 18:49:07 +0000 (14:49 -0400)]
journal: re-fetch active object before advancing set during replay

During a live replay, it's possible that an append and and overflow
into the next object could race with the live playback of the same
object.  Re-fetch an "empty" object at least once before advancing
to next set to ensure all records have been read.

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

9 years agoMerge pull request #9210 from yehudasa/wip-15926-jewel
Yehuda Sadeh [Thu, 19 May 2016 20:08:00 +0000 (13:08 -0700)]
Merge pull request #9210 from yehudasa/wip-15926-jewel

radosgw-admin: fix 'period push' handling of --url

9 years agoradosgw-admin: fix 'period push' handling of --url 9210/head
Casey Bodley [Mon, 16 May 2016 13:37:05 +0000 (09:37 -0400)]
radosgw-admin: fix 'period push' handling of --url

was calling send_to_remote_gateway(), but passing 'url' instead of
'remote'. now uses send_to_remote_or_url() to accept either

Fixes: http://tracker.ceph.com/issues/15926
Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9194 from ceph/wip-jewel-no-lttng-global-link
Boris Ranto [Thu, 19 May 2016 10:56:15 +0000 (12:56 +0200)]
Merge pull request #9194 from ceph/wip-jewel-no-lttng-global-link

Do not link lttng into libglobal

Reviewed-by: Boris Ranto <branto@redhat.com>
9 years agoglobal: don't link lttng into libglobal 9194/head
Karol Mroz [Mon, 2 May 2016 12:01:27 +0000 (14:01 +0200)]
global: don't link lttng into libglobal

Rely on dynamic initialization instead. Linking lttng in this way had
the unfortunate side effect of causing radosgw to segfault (when
daemonized) during sigterm processing (ie. during lttng_ust_exit()).

This was originally removed in 638738f, but accidentally re-added via
5f61d36.

Signed-off-by: Karol Mroz <kmroz@suse.com>
9 years agoMerge pull request #9180 from dillaman/wip-15746-jewel
Jason Dillaman [Wed, 18 May 2016 17:23:39 +0000 (13:23 -0400)]
Merge pull request #9180 from dillaman/wip-15746-jewel

jewel: doc: update mirroring guide to include pool/image status commands

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agodoc: update mirroring guide to include pool/image status commands 9180/head
Mykola Golub [Thu, 12 May 2016 08:15:34 +0000 (11:15 +0300)]
doc: update mirroring guide to include pool/image status commands

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

9 years agodoc: fixup: "rbd-mirror daemon" instead of "rbd-daemon"
Mykola Golub [Thu, 12 May 2016 08:11:55 +0000 (11:11 +0300)]
doc: fixup: "rbd-mirror daemon" instead of "rbd-daemon"

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit ddd6345f8f7edcff638ed435aef316ba3e0e40dd)

9 years agoMerge pull request #8815 from ktdreyer/wip-15646-jewel-system-targets
Sage Weil [Wed, 18 May 2016 09:11:55 +0000 (05:11 -0400)]
Merge pull request #8815 from ktdreyer/wip-15646-jewel-system-targets

jewel: debian: install systemd target files

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agodebian/control: dh_systemd_start is in the dh-systemd package 8815/head
Sage Weil [Thu, 28 Apr 2016 13:13:50 +0000 (09:13 -0400)]
debian/control: dh_systemd_start is in the dh-systemd package

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

9 years agodebian: install systemd target files
Kefu Chai [Fri, 22 Apr 2016 13:07:58 +0000 (21:07 +0800)]
debian: install systemd target files

* enable it using dh_systemd_enable
* start the target using dh_systemd_start
* move the dh_installinit, dh_systemd_enable, dh_systemd_start calls
  down, so they can identify the service files if they care about them.

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

9 years ago10.2.1 v10.2.1
Jenkins Build Slave User [Thu, 12 May 2016 21:48:00 +0000 (21:48 +0000)]
10.2.1

9 years agoMerge pull request #8853 from ceph/wip-jewel-backports 9113/head
Loic Dachary [Thu, 12 May 2016 15:30:14 +0000 (17:30 +0200)]
Merge pull request #8853 from ceph/wip-jewel-backports

jewel: several backports

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #9041 from vshankar/jewel-15721-backport
Ilya Dryomov [Thu, 12 May 2016 14:50:33 +0000 (16:50 +0200)]
Merge pull request #9041 from vshankar/jewel-15721-backport

jewel: rbd: helpful error message on map failure

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
9 years agoMerge pull request #9081 from yehudasa/wip-rgw-period-commit-jewel
Yehuda Sadeh [Wed, 11 May 2016 19:33:50 +0000 (12:33 -0700)]
Merge pull request #9081 from yehudasa/wip-rgw-period-commit-jewel

rgw: period commit fix

9 years agoMerge pull request #8969 from Abhishekvrshny/wip-15731-jewel
Gregory Farnum [Wed, 11 May 2016 19:24:23 +0000 (12:24 -0700)]
Merge pull request #8969 from Abhishekvrshny/wip-15731-jewel

jewel: MDSAuthCap parse no longer fails on paths with hyphens

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #8970 from Abhishekvrshny/wip-15732-jewel
Gregory Farnum [Wed, 11 May 2016 19:23:28 +0000 (12:23 -0700)]
Merge pull request #8970 from Abhishekvrshny/wip-15732-jewel

jewel: MDS incarnation no longer gets lost after remove filesystem

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #8971 from Abhishekvrshny/wip-15738-jewel
Gregory Farnum [Wed, 11 May 2016 19:20:03 +0000 (12:20 -0700)]
Merge pull request #8971 from Abhishekvrshny/wip-15738-jewel

jewel: handle standby-replay nodes properly in upgrades

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #9054 from yehudasa/wip-rgw-admin-output-jewel
Yehuda Sadeh [Wed, 11 May 2016 17:38:30 +0000 (10:38 -0700)]
Merge pull request #9054 from yehudasa/wip-rgw-admin-output-jewel

jewel: rgw admin output

9 years agoMerge pull request #9053 from yehudasa/wip-15745-jewel
Yehuda Sadeh [Wed, 11 May 2016 17:38:17 +0000 (10:38 -0700)]
Merge pull request #9053 from yehudasa/wip-15745-jewel

jewel: rgw: handle stripe transition when flushing final pending_data_bl

9 years agoMerge pull request #9047 from ceph/wip-rgw-period-delete-jewel
Yehuda Sadeh [Wed, 11 May 2016 17:38:02 +0000 (10:38 -0700)]
Merge pull request #9047 from ceph/wip-rgw-period-delete-jewel

jewel: rgw: period delete fixes

9 years agoMerge pull request #9076 from dillaman/wip-cmake-test-rbd-mirror-jewel
Sage Weil [Wed, 11 May 2016 16:30:18 +0000 (12:30 -0400)]
Merge pull request #9076 from dillaman/wip-cmake-test-rbd-mirror-jewel

jewel: cmake: fix rbd compile errors

9 years agocmake: fix rbd compile errors 9076/head
Jason Dillaman [Wed, 11 May 2016 02:37:01 +0000 (22:37 -0400)]
cmake: fix rbd compile errors

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

9 years agocmake: add library cls_journal for target unittest_librbd
runsisi [Thu, 28 Apr 2016 02:22:07 +0000 (10:22 +0800)]
cmake: add library cls_journal for target unittest_librbd

otherwise if we want to generate target unittest_librbd we need to
(re)generate cls_journal manually

Signed-off-by: runsisi <runsisi@zte.com.cn>
(cherry picked from commit 7efb29416b789fcb7e68aab554d6033e6b5ebb43)

9 years agocls::rbd: mirror_image_status_list returned max 64 items 9069/head
Mykola Golub [Wed, 11 May 2016 11:14:46 +0000 (14:14 +0300)]
cls::rbd: mirror_image_status_list returned max 64 items

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit e925ce86243c91e6d64ff8d7b45166e4e3f2650b)

9 years agoMerge pull request #9063 from dachary/wip-15838-jewel
Kefu Chai [Wed, 11 May 2016 08:50:41 +0000 (16:50 +0800)]
Merge pull request #9063 from dachary/wip-15838-jewel

jewel: tests: make check fails on ext4

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agotests: enable make check on ext4 (part 2) 9063/head
Loic Dachary [Mon, 2 May 2016 08:42:24 +0000 (10:42 +0200)]
tests: enable make check on ext4 (part 2)

Followup of 475cc08c330e639b226f2ab57dedbe4495f63022

Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit b0b3a068d4fcc7b739c5dd3d68297e2d517c378e)

9 years agoqa/workunits/ceph-helpers.sh: make ceph-osd behave on ext4
Sage Weil [Sat, 30 Apr 2016 21:12:05 +0000 (17:12 -0400)]
qa/workunits/ceph-helpers.sh: make ceph-osd behave on ext4

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

9 years agoradosgw-admin: 'period commit' sends to new master zone by default 9081/head
Casey Bodley [Tue, 10 May 2016 19:51:27 +0000 (15:51 -0400)]
radosgw-admin: 'period commit' sends to new master zone by default

if no --remote or --url is given, set --remote = master_zone_id to
override the rest_master_conn (which refers to the old master zone)

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

9 years agoradosgw-admin: allow --remote to specify zone or zonegroup id
Casey Bodley [Tue, 10 May 2016 19:48:33 +0000 (15:48 -0400)]
radosgw-admin: allow --remote to specify zone or zonegroup id

--remote was only looking for zonegroup connections. extended to check
for zone connections as well

updated the usage to clarify that it expects zone/zonegroup ids

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

9 years agoradosgw-admin: 'zonegroup add' prints updated zonegroup 9054/head
Casey Bodley [Thu, 5 May 2016 13:59:49 +0000 (09:59 -0400)]
radosgw-admin: 'zonegroup add' prints updated zonegroup

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

9 years agoradosgw-admin: 'zonegroup modify' prints updated zonegroup
Casey Bodley [Thu, 5 May 2016 13:59:32 +0000 (09:59 -0400)]
radosgw-admin: 'zonegroup modify' prints updated zonegroup

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

9 years agoradosgw-admin: 'zone modify' prints updated zone
Casey Bodley [Thu, 5 May 2016 13:56:47 +0000 (09:56 -0400)]
radosgw-admin: 'zone modify' prints updated zone

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

9 years agorgw: handle stripe transition when flushing final pending_data_bl 9053/head
Yehuda Sadeh [Thu, 5 May 2016 21:02:25 +0000 (14:02 -0700)]
rgw: handle stripe transition when flushing final pending_data_bl

Fixes: http://tracker.ceph.com/issues/15745
When complete_writing_data() is called, if pending_data_bl is not empty
we still need to handle stripe transition correctly. If pending_data_bl
has more data that we can allow in current stripe, move to the next one.

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

9 years agoMerge pull request #9052 from dillaman/wip-cmake-rbd-mirror-replay-status-jewel
Samuel Just [Tue, 10 May 2016 18:14:40 +0000 (11:14 -0700)]
Merge pull request #9052 from dillaman/wip-cmake-rbd-mirror-replay-status-jewel

jewel: cmake: add missing source file to rbd_mirror/image_replayer

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agocmake: add missing source file to rbd_mirror/image_replayer 9052/head
Casey Bodley [Fri, 29 Apr 2016 21:33:03 +0000 (17:33 -0400)]
cmake: add missing source file to rbd_mirror/image_replayer

fixes an undefined reference when linking librbd_mirror_internal.a

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

9 years agoMerge pull request #9051 from athanatos/wip-15815-jewel
Sage Weil [Tue, 10 May 2016 18:10:05 +0000 (14:10 -0400)]
Merge pull request #9051 from athanatos/wip-15815-jewel

Wip 15815 jewel

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoceph_test_keyvaluedb: clean up test dir 9051/head
Sage Weil [Fri, 22 Apr 2016 20:38:14 +0000 (16:38 -0400)]
ceph_test_keyvaluedb: clean up test dir

Just like ceph_test_objectstore

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

9 years agoceph_test_keyvaluedb: fixup unit test for keyvaluedb
Allen Samuels [Fri, 22 Apr 2016 18:06:56 +0000 (14:06 -0400)]
ceph_test_keyvaluedb: fixup unit test for keyvaluedb

Fixes: http://tracker.ceph.com/issues/15435
Signed-off-by: Allen Samuels <allen.samuels@sandisk.com>
(cherry picked from commit 85c14de20936ff9ee224f9b6569a73f9bae75f19)

9 years agoMerge pull request #9050 from dillaman/wip-15821
Jason Dillaman [Tue, 10 May 2016 17:52:54 +0000 (13:52 -0400)]
Merge pull request #9050 from dillaman/wip-15821

jewel: rbd-mirror: image sync needs to handle snapshot size and protection status

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agotest: add missing header dependency for MockJournaler 9050/head
Jason Dillaman [Mon, 9 May 2016 22:25:39 +0000 (18:25 -0400)]
test: add missing header dependency for MockJournaler

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

9 years agorbd-mirror: image sync object copy was not properly mapping snapshots
Jason Dillaman [Wed, 4 May 2016 14:23:49 +0000 (10:23 -0400)]
rbd-mirror: image sync object copy was not properly mapping snapshots

When the snapshot sequence is out-of-sync between remote and local
clusters (expected), the objects would not be written with the
correct snapshot context.

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

9 years agorbd-mirror: clean up image sync debug messages
Jason Dillaman [Wed, 4 May 2016 14:23:25 +0000 (10:23 -0400)]
rbd-mirror: clean up image sync debug messages

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

9 years agolibrbd: readahead should not read past end of image
Jason Dillaman [Wed, 4 May 2016 04:12:05 +0000 (00:12 -0400)]
librbd: readahead should not read past end of image

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

9 years agotest: randomize rbd-mirror test case IO
Jason Dillaman [Wed, 4 May 2016 03:17:12 +0000 (23:17 -0400)]
test: randomize rbd-mirror test case IO

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

9 years agorbd-mirror: don't set object map to nonexistent during image sync
Jason Dillaman [Wed, 4 May 2016 03:15:58 +0000 (23:15 -0400)]
rbd-mirror: don't set object map to nonexistent during image sync

The object maps are initialized to nonexistent at snapshot creation,
so this operation is unnecessary.

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

9 years agolibrbd: improve object map debug messages
Jason Dillaman [Wed, 4 May 2016 03:01:30 +0000 (23:01 -0400)]
librbd: improve object map debug messages

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

9 years agotest: snapshot stress test rbd-mirror image sync
Jason Dillaman [Wed, 4 May 2016 02:53:52 +0000 (22:53 -0400)]
test: snapshot stress test rbd-mirror image sync

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

9 years agorbd-mirror: allocate empty object map during snapshot create
Jason Dillaman [Wed, 4 May 2016 01:42:05 +0000 (21:42 -0400)]
rbd-mirror: allocate empty object map during snapshot create

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

9 years agolibrbd: optionally skip object map creation upon snapshot
Jason Dillaman [Fri, 29 Apr 2016 20:43:07 +0000 (16:43 -0400)]
librbd: optionally skip object map creation upon snapshot

This feature is used by rbd-mirror during image bootstrap since
it will directly create an empty object map.

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

9 years agorbd-mirror: refactor snapshot create into its own state machine
Jason Dillaman [Mon, 25 Apr 2016 19:11:28 +0000 (15:11 -0400)]
rbd-mirror: refactor snapshot create into its own state machine

Initial implementation will resize the image (if needed) and create
the snapshot.  It is stubbed out for future state machines for handling
object map and clones.

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

9 years agorbd-mirror: sync snapshot protection status during bootstrap
Jason Dillaman [Fri, 15 Apr 2016 01:47:19 +0000 (21:47 -0400)]
rbd-mirror: sync snapshot protection status during bootstrap

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

9 years agotest: stub test cases for rbd-mirror image bootstrap
Jason Dillaman [Sat, 9 Apr 2016 17:30:56 +0000 (13:30 -0400)]
test: stub test cases for rbd-mirror image bootstrap

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

9 years agotest: share journal::MockJournaler between librbd and rbd-mirror
Jason Dillaman [Tue, 5 Apr 2016 04:03:12 +0000 (00:03 -0400)]
test: share journal::MockJournaler between librbd and rbd-mirror

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

Conflicts:
src/test/librbd/test_mock_Journal.cc: MockJournaler moved to new file