Commit Graph

53032 Commits

Author SHA1 Message Date
Sage Weil
56edf3a428 Merge pull request #8917 from liewegas/wip-civetweb-fix
civetweb: combine various submodule changes

Reviewed-by: Adam Emerson <aemerson@redhat.com>
2016-05-03 16:01:41 -04:00
David Zafman
a551b6bd5c rados: Don't bother showing list-inconsistent-* errors that aren't set
Signed-off-by: David Zafman <dzafman@redhat.com>
2016-05-03 12:11:56 -07:00
David Zafman
fdca113fc2 osd, rados: Fixes for list-inconsistent-snapset
Signed-off-by: David Zafman <dzafman@redhat.com>
2016-05-03 12:11:56 -07:00
David Zafman
4fc4326b36 include, rados: Fixes for list-inconsistent-obj and librados
Signed-off-by: David Zafman <dzafman@redhat.com>
2016-05-03 12:11:56 -07:00
Sage Weil
b99681de6a 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>
2016-05-03 15:01:19 -04:00
Karol Mroz
85a727f0a8 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>
2016-05-03 20:22:27 +02:00
Jason Dillaman
2c88ef8682 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>
2016-05-03 14:13:46 -04:00
Jason Dillaman
4175db609c 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>
2016-05-03 13:47:31 -04:00
Adam C. Emerson
4252357d55 test: Fix warnings in chain_xattr tests
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2016-05-03 13:26:54 -04:00
Josh Durgin
473ce61bea Merge pull request #8910 from dillaman/wip-15709
librbd: unlock image if journal error encountered during lock

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-05-03 10:13:58 -07:00
Adam C. Emerson
e1fc9f895a tests: Fix warnings in C write operations test
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2016-05-03 13:10:27 -04:00
Josh Durgin
1027e13674 Merge pull request #8907 from dillaman/wip-15690
librbd: possible race condition leads to use-after-free

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-05-03 10:09:07 -07:00
Yehuda Sadeh
8c3646a319 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>
2016-05-03 08:26:39 -07:00
Mark Nelson
793ceac2f3 Fix reveresed promote throttle default parameters.
Signed-off-by: Mark Nelson <mnelson@redhat.com>
2016-05-03 09:56:47 -05:00
Sage Weil
8c761ac07b test/mon/mkfs.sh: clean up kv_backend file
Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-03 10:41:08 -04:00
Sage Weil
905bfb1edf mon/MonitorDBStore: remember kv backend type
If it is specified, use it; otherwise, go by the config
option.

Record the type when creating the store.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-03 10:41:07 -04:00
Jason Dillaman
a11f5e8e55 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>
2016-05-03 10:15:08 -04:00
xie xingguo
6fea83adff mon/OSDMonitor: kill dead code
These codes are not applicable any more,
and removing unnecessary code is always the preferred option.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-05-03 21:28:09 +08:00
Sage Weil
fe20133543 Merge pull request #8893 from flyd1005/wip-fix-duplicated1
init-ceph.in: remove duplicated words
2016-05-03 09:08:22 -04:00
Sage Weil
ca14790ea3 Merge pull request #8894 from flyd1005/wip-fix-duplicated2
os: remove duplicated words
2016-05-03 09:08:14 -04:00
Sage Weil
55c7d5eb31 Merge pull request #8895 from flyd1005/wip-fix-duplicated3
pybind/rados: remove duplicated words
2016-05-03 09:08:05 -04:00
Sage Weil
839213a018 Merge pull request #8896 from flyd1005/wip-fix-duplicated4
mon: remove duplicated words
2016-05-03 09:07:52 -04:00
Sage Weil
4ec7cbf35b Merge pull request #8898 from flyd1005/wip-fix-duplicated6
libcephfs.h: remove duplicated words
2016-05-03 09:07:28 -04:00
Sage Weil
4bc87c77f0 Merge pull request #8899 from flyd1005/wip-fix-duplicated7
erasure-code: remove duplicated words
2016-05-03 09:07:00 -04:00
Sage Weil
76781ff6bb Merge pull request #8900 from flyd1005/wip-fix-duplicated8
common: remove duplicated words
2016-05-03 09:06:52 -04:00
Sage Weil
54f97aca95 Merge pull request #8901 from flyd1005/wip-fix-duplicated9
cls_user: remove duplicated words

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-03 09:06:42 -04:00
Sage Weil
88daf7b3f9 mon/MonitorDBStore: {read,write}_meta
These are lifted from ObjectStore.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-03 08:51:14 -04:00
Sage Weil
3f62c8463a mon/MonitorDBStore: move backend instantiation out of ctor
Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-03 08:51:12 -04:00
Sage Weil
3f3ef3faff mon/MonitorDBStore: fix bug in dump output file
Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-03 08:50:43 -04:00
Haomai Wang
0a2392919f test_msgr: add delay inject test
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-05-03 20:11:14 +08:00
Haomai Wang
83f7db58aa AsyncConnection: make delay message happen within original thread
Fixes: http://tracker.ceph.com/issues/15503
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-05-03 20:11:14 +08:00
Piotr Dałek
49a0c9981b msg/async: add missing DelayedDelivery and delay injection
Delay injection was missing from a few spots, also, DelayedDelivery
was added.

Fixes: http://tracker.ceph.com/issues/15372
Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
2016-05-03 20:11:14 +08:00
John Spray
d94115aa2a 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>
2016-05-03 12:57:22 +01:00
John Spray
97dd6897ef 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>
2016-05-03 12:57:22 +01:00
John Spray
ec8f3db3e5 mds: omit fscid in single-filesystem status output
Signed-off-by: John Spray <john.spray@redhat.com>
2016-05-03 12:57:22 +01:00
John Spray
2a2a56b2d0 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>
2016-05-03 12:57:22 +01:00
John Spray
cdf8a29f81 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>
2016-05-03 12:57:22 +01:00
John Spray
edfda9c6b0 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>
2016-05-03 12:57:22 +01:00
Jason Dillaman
ea9c9332de Merge pull request #8698 from HeyoQiang/hyq0422
rbd: help message distinction between commands and aliases

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-05-03 07:49:01 -04:00
Jason Dillaman
d9421a25b5 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>
2016-05-03 07:41:30 -04:00
Orit Wasserman
c666bc3f71 Merge pull request #8788 from jmunhoz/fix-15626
rgw: add AWS4 completion support for RGW_OP_SET_BUCKET_WEBSITE
2016-05-03 13:03:48 +02:00
John Spray
2ebf564358 Merge pull request #8897 from flyd1005/wip-fix-duplicated5
mds: remove duplicated words

Reviewed-by: John Spray <john.spray@redhat.com>
2016-05-03 05:50:56 -05:00
Orit Wasserman
e805674d6a Merge pull request #8760 from theanalyst/f/rgw-orphans-list-jobs
rgw orphans list jobs
2016-05-03 11:37:36 +02:00
YongQiang
1bf26509c6 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>
2016-05-03 05:35:50 -04:00
Kefu Chai
65426a522d os/FileStore::sync_entry check for stop in after wait
there is chance that the sync_entry() gets signaled in the
WaitInterval(max_interval) call because of sync_cond.Signal() call after
"stop = true" in umount(), so without this change, sync_entry() will
continue wait until min_interval is reached. this forces umount() to
wait even it has called d_force_sync(), and hence slows down the
progress of umount(). so we need to check for `stop` if we are not
signalled because of `force_sync`.

Fixes: http://tracker.ceph.com/issues/15695
Reported-by: Haomai Wang <haomaiwang@gmail.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-05-03 17:27:50 +08:00
Loic Dachary
a71f3dc93c 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>
2016-05-03 10:31:50 +02:00
Orit Wasserman
45d526e094 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>
2016-05-03 10:26:33 +02:00
Orit Wasserman
6c3ef5de85 Merge pull request #7193 from theanalyst/doc/rgw-13066-fix
doc:explain service tenant config for rgw keystone
2016-05-03 10:16:38 +02:00
Loic Dachary
dad2e195ce 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>
2016-05-03 10:10:07 +02:00
Loic Dachary
13b144aa34 Merge pull request #8875 from tchaikov/wip-double-colon
automake: use :: rule for adding target

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-05-03 10:08:56 +02:00