]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agocommon: Fix ObjBencher clean_up when no prefix specified
David Zafman [Thu, 31 Mar 2016 03:29:22 +0000 (20:29 -0700)]
common: Fix ObjBencher clean_up when no prefix specified

By default remove all objects named benchmark_data_{hostname} when
there is no benchmark_last_metadata present.

Fixes: http://tracker.ceph.com/issues/15338
Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agotest: Test rados ls with --all option
David Zafman [Wed, 6 Apr 2016 20:41:45 +0000 (13:41 -0700)]
test: Test rados ls with --all option

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agotest: Find ceph command as CEPH_TOOL like rados command
David Zafman [Thu, 7 Apr 2016 23:04:48 +0000 (16:04 -0700)]
test: Find ceph command as CEPH_TOOL like rados command

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agodebian,rpm: add jq build dependency
Sage Weil [Wed, 4 May 2016 20:01:47 +0000 (16:01 -0400)]
debian,rpm: add jq build dependency

Needed since db517ba9176f1ee829453b016b1bd43c6054a555.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agolibrbd: reduce log level for image format 1 warning
Jason Dillaman [Wed, 4 May 2016 17:36:06 +0000 (13:36 -0400)]
librbd: reduce log level for image format 1 warning

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
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>
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>
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>
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>
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>
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>
9 years agorpm: put /sbin/ldconfig into -p
Nathan Cutler [Sun, 11 Oct 2015 12:59:20 +0000 (14:59 +0200)]
rpm: put /sbin/ldconfig into -p

This saves approximately 1 second per invocation.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
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>
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>
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>
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>
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>
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>
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>
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>
9 years agoFixes for list-inconsistent-*
David Zafman [Wed, 4 May 2016 17:07:50 +0000 (10:07 -0700)]
Fixes for list-inconsistent-*

Improve rados scrub output
Add epoch for future repair-read feature
Add testing of rados scrub output

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kefu@redhat.com>
9 years agotest: Add testing of new scrub commands in rados 7289/head
David Zafman [Tue, 3 May 2016 19:10:38 +0000 (12:10 -0700)]
test: Add testing of new scrub commands in rados

Test list-inconsistent-pg
Test list-inconsistent-obj
Test inconsistent-snapset

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agoMerge pull request #8916 from linuxbox2/xio-cmake
Kefu Chai [Wed, 4 May 2016 16:50:47 +0000 (00:50 +0800)]
Merge pull request #8916 from linuxbox2/xio-cmake

cmake: <UPPERCASED_NAME>_FOUND in Findxio.cmake

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8768 from cbodley/wip-rgw-admin-zonegroup
Orit Wasserman [Wed, 4 May 2016 14:46:02 +0000 (16:46 +0200)]
Merge pull request #8768 from cbodley/wip-rgw-admin-zonegroup

radosgw-admin: add missing --zonegroup-id to usage

9 years agoMerge pull request #8300 from jcsp/wip-standby-replay-reorg
Gregory Farnum [Wed, 4 May 2016 14:28:19 +0000 (07:28 -0700)]
Merge pull request #8300 from jcsp/wip-standby-replay-reorg

mds: Fix standby replay MDS in upgrades and simplify standby replay logic (#15591)

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #8550 from xiexingguo/xxg-wip-cls
Sage Weil [Wed, 4 May 2016 13:28:44 +0000 (09:28 -0400)]
Merge pull request #8550 from xiexingguo/xxg-wip-cls

objclass: honour do_osd_ops() results before going any further

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8367 from Yan-waller/yj-wip-utthrottle
Sage Weil [Wed, 4 May 2016 13:28:31 +0000 (09:28 -0400)]
Merge pull request #8367 from Yan-waller/yj-wip-utthrottle

test/throttle: reassign the value of 'delay' in ThrottleTest.get

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #8392 from dachary/wip-virtualenv-jewel
Sage Weil [Wed, 4 May 2016 13:27:58 +0000 (09:27 -0400)]
Merge pull request #8392 from dachary/wip-virtualenv-jewel

Makefile-env.am: set a default for CEPH_BUILD_VIRTUALENV (part 3)

Reviewed-by: Alfredo Deza <adeza@redhat.com>
9 years agoMerge pull request #8439 from ErwanAliasr1/evelu-file-leak
Sage Weil [Wed, 4 May 2016 13:27:25 +0000 (09:27 -0400)]
Merge pull request #8439 from ErwanAliasr1/evelu-file-leak

tests: Delete temporary files created by ceph_objectstore_tool.py

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8632 from xiexingguo/xxg-wip-deepscrub
Sage Weil [Wed, 4 May 2016 13:26:47 +0000 (09:26 -0400)]
Merge pull request #8632 from xiexingguo/xxg-wip-deepscrub

osd: fix be_deep_scrub() can't catch omap error

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8742 from majianpeng/bluestore-wal-transaction
Sage Weil [Wed, 4 May 2016 13:26:30 +0000 (09:26 -0400)]
Merge pull request #8742 from majianpeng/bluestore-wal-transaction

os/bluestore: record released extents into bluestore_wal_transaction_t.

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8763 from wjwithagen/patch-10
Sage Weil [Wed, 4 May 2016 13:14:11 +0000 (09:14 -0400)]
Merge pull request #8763 from wjwithagen/patch-10

os/filestore: Make sure str-pointer is not 0x0 when referenced

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #8808 from wjin/fast_heartbeat
Sage Weil [Wed, 4 May 2016 13:13:47 +0000 (09:13 -0400)]
Merge pull request #8808 from wjin/fast_heartbeat

osd: fast dispatch heartbeat message

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8811 from stiopaa1/log_includes
Sage Weil [Wed, 4 May 2016 13:12:47 +0000 (09:12 -0400)]
Merge pull request #8811 from stiopaa1/log_includes

log: remove unnecessary includes from header file

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8831 from wjin/clean
Sage Weil [Wed, 4 May 2016 13:12:34 +0000 (09:12 -0400)]
Merge pull request #8831 from wjin/clean

osd: clean heartbeat dispatch message

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8821 from aderumier/deb-fix-default-ceph-location
Sage Weil [Wed, 4 May 2016 13:07:57 +0000 (09:07 -0400)]
Merge pull request #8821 from aderumier/deb-fix-default-ceph-location

debian: fix /etc/default/ceph location

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoosd/PG: update info.stats.* mappings on splitReviewed-by: Samuel Just <sjust@redhat...
Sage Weil [Wed, 4 May 2016 13:06:55 +0000 (09:06 -0400)]
osd/PG: update info.stats.* mappings on splitReviewed-by: Samuel Just <sjust@redhat.com>

osd/PG: update info.stats.* mappings on split

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #8733 from xiexingguo/xxg-wip-fix-reweightlessutil
Sage Weil [Wed, 4 May 2016 13:06:08 +0000 (09:06 -0400)]
Merge pull request #8733 from xiexingguo/xxg-wip-fix-reweightlessutil

mon/OSDMonitor: improve reweight_by_utilization() logic

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8837 from liewegas/wip-reweight
Sage Weil [Wed, 4 May 2016 13:05:14 +0000 (09:05 -0400)]
Merge pull request #8837 from liewegas/wip-reweight

mon/OSDMonitor: max_osds must be > 0 for reweight-by-*

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #8926 from ceph/wip-ec-test-check
Loic Dachary [Wed, 4 May 2016 12:03:37 +0000 (14:03 +0200)]
Merge pull request #8926 from ceph/wip-ec-test-check

test/ec: build the libs only when 'make check'

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #8546 from jcsp/wip-15465
John Spray [Wed, 4 May 2016 10:50:03 +0000 (05:50 -0500)]
Merge pull request #8546 from jcsp/wip-15465

mds: fix auth caps with hyphen in path (#15465)

Reviewed-by: Yan, Zheng <zyan@redhat.com>
9 years agoMerge pull request #8484 from jcsp/wip-15399
John Spray [Wed, 4 May 2016 10:49:04 +0000 (05:49 -0500)]
Merge pull request #8484 from jcsp/wip-15399

mds: use epoch as incarnation counter (#15399)

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agotest/ec: build the libs only when 'make check' 8926/head
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>
9 years agoMerge pull request #8876 from kmroz/wip-fix-rgw-lttng-segfault
Josh Durgin [Wed, 4 May 2016 00:32:16 +0000 (17:32 -0700)]
Merge pull request #8876 from kmroz/wip-fix-rgw-lttng-segfault

global: don't link lttng into libglobal

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agocmake: <UPPERCASED_NAME>_FOUND in Findxio.cmake 8916/head
Matt Benjamin [Tue, 3 May 2016 17:19:43 +0000 (13:19 -0400)]
cmake: <UPPERCASED_NAME>_FOUND in Findxio.cmake

For uniformity, upcase all these variables.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agoMerge pull request #8637 from roidayan/xio-remove_rdma_and_ibverbs_from_configure
Casey Bodley [Tue, 3 May 2016 21:11:01 +0000 (17:11 -0400)]
Merge pull request #8637 from roidayan/xio-remove_rdma_and_ibverbs_from_configure

confiugre.ac: remove rdma and ibverbs dependency from xio

9 years agoMerge pull request #8704 from ceph/wip-cmake-xio-libs
Casey Bodley [Tue, 3 May 2016 21:10:26 +0000 (17:10 -0400)]
Merge pull request #8704 from ceph/wip-cmake-xio-libs

cmake: removed rdmacm & ibverbs parallel to PR#8637

9 years agoMerge pull request #8914 from adamemerson/wip-grr-warnings
Gregory Farnum [Tue, 3 May 2016 20:37:41 +0000 (13:37 -0700)]
Merge pull request #8914 from adamemerson/wip-grr-warnings

I have a hatred for warnings

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #8917 from liewegas/wip-civetweb-fix
Sage Weil [Tue, 3 May 2016 20:01:41 +0000 (16:01 -0400)]
Merge pull request #8917 from liewegas/wip-civetweb-fix

civetweb: combine various submodule changes

Reviewed-by: Adam Emerson <aemerson@redhat.com>
9 years agorados: Don't bother showing list-inconsistent-* errors that aren't set
David Zafman [Fri, 29 Apr 2016 18:25:18 +0000 (11:25 -0700)]
rados: Don't bother showing list-inconsistent-* errors that aren't set

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agoosd, rados: Fixes for list-inconsistent-snapset
David Zafman [Sat, 30 Apr 2016 00:09:13 +0000 (17:09 -0700)]
osd, rados: Fixes for list-inconsistent-snapset

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agoinclude, rados: Fixes for list-inconsistent-obj and librados
David Zafman [Fri, 29 Apr 2016 18:26:39 +0000 (11:26 -0700)]
include, rados: Fixes for list-inconsistent-obj and librados

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agocivetweb: combine various submodule changes 8917/head
Sage Weil [Tue, 3 May 2016 19:01:19 +0000 (15:01 -0400)]
civetweb: combine various submodule changes

There were some accidental reverts, fixes, re-reverts,
and follow-on changes that are hard to follow and in the
end did not include what we want.  Merge it all together.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoglobal: don't link lttng into libglobal 8876/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 #8809 from trociny/wip-rbd-mirror-asok-restart
Jason Dillaman [Tue, 3 May 2016 18:13:46 +0000 (14:13 -0400)]
Merge pull request #8809 from trociny/wip-rbd-mirror-asok-restart

rbd-mirror: admin socket commands to start/stop/restart mirroring

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8775 from cy-lee/fix-15604-rbd-nbd-write-error
Jason Dillaman [Tue, 3 May 2016 17:47:31 +0000 (13:47 -0400)]
Merge pull request #8775 from cy-lee/fix-15604-rbd-nbd-write-error

rbd-nbd: fix rbd-nbd aio callback error handling

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agotest: Fix warnings in chain_xattr tests 8914/head
Adam C. Emerson [Tue, 3 May 2016 16:53:33 +0000 (12:53 -0400)]
test: Fix warnings in chain_xattr tests

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
9 years agoMerge pull request #8910 from dillaman/wip-15709
Josh Durgin [Tue, 3 May 2016 17:13:58 +0000 (10:13 -0700)]
Merge pull request #8910 from dillaman/wip-15709

librbd: unlock image if journal error encountered during lock

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agotests: Fix warnings in C write operations test
Adam C. Emerson [Tue, 3 May 2016 16:23:17 +0000 (12:23 -0400)]
tests: Fix warnings in C write operations test

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
9 years agoMerge pull request #8907 from dillaman/wip-15690
Josh Durgin [Tue, 3 May 2016 17:09:07 +0000 (10:09 -0700)]
Merge pull request #8907 from dillaman/wip-15690

librbd: possible race condition leads to use-after-free

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8793 from cbodley/wip-rgw-admin-modify
Yehuda Sadeh [Tue, 3 May 2016 15:26:39 +0000 (08:26 -0700)]
Merge pull request #8793 from cbodley/wip-rgw-admin-modify

radosgw-admin: update usage for zone[group] modify

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agolibrbd: unlock image if journal error encountered during lock 8910/head
Jason Dillaman [Tue, 3 May 2016 14:15:08 +0000 (10:15 -0400)]
librbd: unlock image if journal error encountered during lock

Explicitly unlock to prevent a client from accidentally blacklisting
itself when retrying the lock.

Fixes: http://tracker.ceph.com/issues/15709
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8893 from flyd1005/wip-fix-duplicated1
Sage Weil [Tue, 3 May 2016 13:08:22 +0000 (09:08 -0400)]
Merge pull request #8893 from flyd1005/wip-fix-duplicated1

init-ceph.in: remove duplicated words

9 years agoMerge pull request #8894 from flyd1005/wip-fix-duplicated2
Sage Weil [Tue, 3 May 2016 13:08:14 +0000 (09:08 -0400)]
Merge pull request #8894 from flyd1005/wip-fix-duplicated2

os: remove duplicated words

9 years agoMerge pull request #8895 from flyd1005/wip-fix-duplicated3
Sage Weil [Tue, 3 May 2016 13:08:05 +0000 (09:08 -0400)]
Merge pull request #8895 from flyd1005/wip-fix-duplicated3

pybind/rados: remove duplicated words

9 years agoMerge pull request #8896 from flyd1005/wip-fix-duplicated4
Sage Weil [Tue, 3 May 2016 13:07:52 +0000 (09:07 -0400)]
Merge pull request #8896 from flyd1005/wip-fix-duplicated4

mon: remove duplicated words

9 years agoMerge pull request #8898 from flyd1005/wip-fix-duplicated6
Sage Weil [Tue, 3 May 2016 13:07:28 +0000 (09:07 -0400)]
Merge pull request #8898 from flyd1005/wip-fix-duplicated6

libcephfs.h: remove duplicated words

9 years agoMerge pull request #8899 from flyd1005/wip-fix-duplicated7
Sage Weil [Tue, 3 May 2016 13:07:00 +0000 (09:07 -0400)]
Merge pull request #8899 from flyd1005/wip-fix-duplicated7

erasure-code: remove duplicated words

9 years agoMerge pull request #8900 from flyd1005/wip-fix-duplicated8
Sage Weil [Tue, 3 May 2016 13:06:52 +0000 (09:06 -0400)]
Merge pull request #8900 from flyd1005/wip-fix-duplicated8

common: remove duplicated words

9 years agoMerge pull request #8901 from flyd1005/wip-fix-duplicated9
Sage Weil [Tue, 3 May 2016 13:06:42 +0000 (09:06 -0400)]
Merge pull request #8901 from flyd1005/wip-fix-duplicated9

cls_user: remove duplicated words

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agomds: fix upgrades with replay daemons in map 8300/head
John Spray [Fri, 29 Apr 2016 19:12:20 +0000 (20:12 +0100)]
mds: fix upgrades with replay daemons in map

In the new world, a standby replay daemon which
is actively replaying has its rank set.  In the old
world it did not: map this during the upgrade/downgrade
paths in decode/encode.

Fixes: http://tracker.ceph.com/issues/15591
Signed-off-by: John Spray <john.spray@redhat.com>
9 years agodoc: add cephfs daemon management docs
John Spray [Wed, 30 Mar 2016 11:06:27 +0000 (12:06 +0100)]
doc: add cephfs daemon management docs

Principally to tell people how to configure
standby, but more generally as a place to define
our terms for GIDs etc.

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agomds: omit fscid in single-filesystem status output
John Spray [Wed, 30 Mar 2016 11:05:43 +0000 (12:05 +0100)]
mds: omit fscid in single-filesystem status output

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agomds: simplify standby/standby-replay logic
John Spray [Thu, 24 Mar 2016 13:23:26 +0000 (13:23 +0000)]
mds: simplify standby/standby-replay logic

This used to use an arcane set of constants
in standby_for_rank, combined with daemons sometimes
sending requests to enter state STANDBY_REPLAY.

Simplify this so that there is only one place we
put daemons into standby replay, and that is
in tick->maybe_promote_staandby.

There is a behavioural change in here, which is
that we used to sometimes promote standbys to
be standby-replay, even if they didn't have
"standby replay = true", when they did have
a standby_for_rank or standby_for_name set.
I'm calling that a bug, and making it so that
daemons will only go into standby-replay if
"standby replay = true" is set.

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agomessages: add MMDSBeacon::standby_replay
John Spray [Thu, 24 Mar 2016 13:13:55 +0000 (13:13 +0000)]
messages: add MMDSBeacon::standby_replay

So that daemons can explicitly say that they
want to be standby replay, instead of using
magic standby_for_rank values.

Because in some cases daemons would indicate this
with a beacon requesting STANDBY_REPLAY state, we
also munge these during decode to be normal STANDBY
requests with standby_replay=true.

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agomds: remove ONESHOT_REPLAY mode
John Spray [Tue, 22 Mar 2016 17:44:22 +0000 (17:44 +0000)]
mds: remove ONESHOT_REPLAY mode

This predated cephfs-journal-tool.  Don't bother
with any backwards-compatibility mechanisms here, as
it was a seriously niche undocumented thing.

On the off chance that someone ran an old ceph-mds against
a newer ceph-mon with oneshot enabled, it shouldn't break
anything, it just won't do what they want.

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #8698 from HeyoQiang/hyq0422
Jason Dillaman [Tue, 3 May 2016 11:49:01 +0000 (07:49 -0400)]
Merge pull request #8698 from HeyoQiang/hyq0422

rbd: help message distinction between commands and aliases

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: possible race condition leads to use-after-free 8907/head
Jason Dillaman [Tue, 3 May 2016 11:41:30 +0000 (07:41 -0400)]
librbd: possible race condition leads to use-after-free

The invoke async operation state machine can complete before the
owner lock is released.  Use a stack reference to prevent
use-after-free.

Fixes: http://tracker.ceph.com/issues/15690
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8788 from jmunhoz/fix-15626
Orit Wasserman [Tue, 3 May 2016 11:03:48 +0000 (13:03 +0200)]
Merge pull request #8788 from jmunhoz/fix-15626

rgw: add AWS4 completion support for RGW_OP_SET_BUCKET_WEBSITE

9 years agoMerge pull request #8897 from flyd1005/wip-fix-duplicated5
John Spray [Tue, 3 May 2016 10:50:56 +0000 (05:50 -0500)]
Merge pull request #8897 from flyd1005/wip-fix-duplicated5

mds: remove duplicated words

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #8760 from theanalyst/f/rgw-orphans-list-jobs
Orit Wasserman [Tue, 3 May 2016 09:37:36 +0000 (11:37 +0200)]
Merge pull request #8760 from theanalyst/f/rgw-orphans-list-jobs

rgw orphans list jobs

9 years agorbd:make a distinction of help message between ''rbd snap rollback" and "rbd snap... 8698/head
YongQiang [Fri, 22 Apr 2016 15:20:31 +0000 (11:20 -0400)]
rbd:make a distinction of help message between ''rbd snap rollback" and "rbd snap revert"

Fixes: https://tracker.ceph.com/issues/15521
Signed-off-by: Yongqiang He <he.yongqiang@h3c.com>
9 years agoMerge pull request #8469 from dachary/wip-15403-api-test-timeout
Loic Dachary [Tue, 3 May 2016 08:31:50 +0000 (10:31 +0200)]
Merge pull request #8469 from dachary/wip-15403-api-test-timeout

tests: be more generous with test timeout

Reviewed-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #8655 from theanalyst/rgw/multisite-delete
Orit Wasserman [Tue, 3 May 2016 08:26:33 +0000 (10:26 +0200)]
Merge pull request #8655 from theanalyst/rgw/multisite-delete

rgw: forward delete bucket to master before deleting them in a zone
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #7193 from theanalyst/doc/rgw-13066-fix
Orit Wasserman [Tue, 3 May 2016 08:16:38 +0000 (10:16 +0200)]
Merge pull request #7193 from theanalyst/doc/rgw-13066-fix

doc:explain service tenant config for rgw keystone

9 years agoMerge pull request #8782 from SUSE/wip-15627
Loic Dachary [Tue, 3 May 2016 08:10:07 +0000 (10:10 +0200)]
Merge pull request #8782 from SUSE/wip-15627

install-deps.sh: systemd-rpm-macros must be installed on SUSE

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #8875 from tchaikov/wip-double-colon
Loic Dachary [Tue, 3 May 2016 08:08:56 +0000 (10:08 +0200)]
Merge pull request #8875 from tchaikov/wip-double-colon

automake: use :: rule for adding target

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agorbd-nbd: Fix aio_callback error handling 8775/head
cy.l@inwinstack.com [Sat, 30 Apr 2016 07:22:29 +0000 (15:22 +0800)]
rbd-nbd: Fix aio_callback error handling

Change aio_callback return code handling for NBD_CMD_READ command.

Tracker:
http://tracker.ceph.com/issues/15604

Signed-off-by: Chang-Yi Lee <cy.l@inwinstack.com>
9 years agoMerge pull request #8852 from yuyuyu101/wip-async-clock
Kefu Chai [Tue, 3 May 2016 07:25:12 +0000 (15:25 +0800)]
Merge pull request #8852 from yuyuyu101/wip-async-clock

msg/async/Event: replace ceph_clock_now with coarse_real_clock

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agocls_user: remove duplicated words 8901/head
Li Peng [Tue, 3 May 2016 07:21:20 +0000 (15:21 +0800)]
cls_user: remove duplicated words

Signed-off-by: Li Peng <lip@dtdream.com>
9 years agocommon: remove duplicated words 8900/head
Li Peng [Tue, 3 May 2016 07:16:06 +0000 (15:16 +0800)]
common: remove duplicated words

Signed-off-by: Li Peng <lip@dtdream.com>
9 years agoerasure-code: remove duplicated words 8899/head
Li Peng [Tue, 3 May 2016 07:05:34 +0000 (15:05 +0800)]
erasure-code: remove duplicated words

Signed-off-by: Li Peng <lip@dtdream.com>
9 years agolibcephfs.h: remove duplicated words 8898/head
Li Peng [Tue, 3 May 2016 06:59:44 +0000 (14:59 +0800)]
libcephfs.h: remove duplicated words

Signed-off-by: Li Peng <lip@dtdream.com>
9 years agomds: remove duplicated 'this' 8897/head
Li Peng [Tue, 3 May 2016 06:55:59 +0000 (14:55 +0800)]
mds: remove duplicated 'this'

Signed-off-by: Li Peng <lip@dtdream.com>
9 years agomds: remove duplicated words
Li Peng [Tue, 3 May 2016 06:53:54 +0000 (14:53 +0800)]
mds: remove duplicated words

Signed-off-by: Li Peng <lip@dtdream.com>
9 years agomon: remove duplicated words 8896/head
Li Peng [Tue, 3 May 2016 06:48:20 +0000 (14:48 +0800)]
mon: remove duplicated words

Signed-off-by: Li Peng <lip@dtdream.com>
9 years agopybind/rados: remove duplicated words 8895/head
Li Peng [Tue, 3 May 2016 06:43:47 +0000 (14:43 +0800)]
pybind/rados: remove duplicated words

Signed-off-by: Li Peng <lip@dtdream.com>
9 years agoos: remove duplicated words 8894/head
Li Peng [Tue, 3 May 2016 06:37:52 +0000 (14:37 +0800)]
os: remove duplicated words

Signed-off-by: Li Peng <lip@dtdream.com>
9 years agoinit-ceph.in: remove duplicated words 8893/head
Li Peng [Tue, 3 May 2016 06:28:47 +0000 (14:28 +0800)]
init-ceph.in: remove duplicated words

Signed-off-by: Li Peng <lip@dtdream.com>
9 years agoMerge pull request #8891 from tchaikov/wip-fix-test-using-dash
Kefu Chai [Tue, 3 May 2016 05:41:29 +0000 (13:41 +0800)]
Merge pull request #8891 from tchaikov/wip-fix-test-using-dash

test/encoding/readable.sh: use bash instead of sh

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>