]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Josh Durgin [Wed, 30 Sep 2015 00:02:57 +0000 (17:02 -0700)]
ReplicatedPG: clearing a whiteout should create the object
This was uncovered by
75321943729f1d5dfacb68645e3c5483740d66f8 . Since
rbd_create() does a stat, the obc is cached as a whiteout, and the
subsequent create(EXCL) would fall through to return false from
maybe_create_new_object(). This would then skip adding a touch() to
the transaction.
Fixes: #13281
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
branto1 [Tue, 29 Sep 2015 10:57:32 +0000 (12:57 +0200)]
Merge pull request #6103 from SUSE/wip-re-redrop-fdupes
ceph.spec.in: re-re-drop fdupes
Reviewed-by: Boris Ranto <branto@redhat.com>
Nathan Cutler [Tue, 29 Sep 2015 06:57:16 +0000 (08:57 +0200)]
ceph.spec.in: re-re-drop fdupes
The %fdupes call was dropped by
53072b9019caf72e0313b2804ea174237ed7da33
Later, it got accidentally reinstated by
ceb93e8e69e125c9358f63b0099e7509b6624bcf
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Gregory Farnum [Tue, 29 Sep 2015 05:21:34 +0000 (22:21 -0700)]
Merge pull request #6025 from ukernel/wip-13167
journaler: detect unexpected holes in journal objects
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Gregory Farnum [Tue, 29 Sep 2015 05:19:11 +0000 (22:19 -0700)]
Merge pull request #5849 from ukernel/wip-32bits-ceph-fuse
Wip 32bits ceph fuse
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Gregory Farnum [Tue, 29 Sep 2015 05:14:52 +0000 (22:14 -0700)]
Merge pull request #4791 from ceph/wip-11783
cephfs: detect completed cap flushes
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Yan, Zheng [Tue, 29 Sep 2015 02:12:39 +0000 (10:12 +0800)]
Merge pull request #6070 from jcsp/wip-reformat-subtreemaptest
Fix reformatting journals containing SUBTREEMAP_TEST events
Yan, Zheng [Tue, 29 Sep 2015 02:02:28 +0000 (10:02 +0800)]
Merge pull request #6082 from jcsp/wip-client-quota-roots
Fix quota enforcement on subdir mounts
Sage Weil [Mon, 28 Sep 2015 20:42:01 +0000 (16:42 -0400)]
Merge pull request #6078 from H3C/wip-13208
Objecter: maybe access wild pointer(op) in _op_submit_with_budget.
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Mon, 28 Sep 2015 20:41:44 +0000 (16:41 -0400)]
Merge pull request #6064 from H3C/wip-rbd-bugfix1
Objecter: misc fix for segmentation fault.
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 28 Sep 2015 20:40:31 +0000 (16:40 -0400)]
Merge pull request #6084 from liewegas/wip-revert-scrub
Revert "osd: new pool settings: scrub intervals"
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Ken Dreyer [Mon, 28 Sep 2015 19:09:33 +0000 (13:09 -0600)]
Merge pull request #5832 from SUSE/wip-drop-dup-rcceph
ceph.spec.in: refrain from duplicating %{_sbindir}/rcceph
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Samuel Just [Mon, 28 Sep 2015 17:17:41 +0000 (10:17 -0700)]
Merge pull request #6098 from liewegas/wip-crash-replay-interval
don't assume crash_replay_itnerval == 45
Reviewed-by: Samuel Just <sjust@redhat.com>
Sage Weil [Mon, 28 Sep 2015 17:13:40 +0000 (13:13 -0400)]
qa/workunits/cephtool/test.sh: don't assume crash_replay_interval=45
e.g., it's 5 in teuthology's ceph.conf.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 28 Sep 2015 15:44:46 +0000 (11:44 -0400)]
Merge pull request #6076 from liewegas/wip-scrub-fix
osd/PG: compensate for sloppy hobject scrub bounds from hammer
Reviewed-by: Kefu Chai <kchai@redhat.com>
Loic Dachary [Sat, 26 Sep 2015 14:12:33 +0000 (16:12 +0200)]
Merge pull request #6086 from stiopaa1/librados_missingsemicolon
examples/librados/hello_world.cc:missing semicolon
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Michal Jarzabek [Sat, 26 Sep 2015 13:45:22 +0000 (14:45 +0100)]
examples/librados/hello_world.cc:missing semicolon
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
Sage Weil [Sat, 26 Sep 2015 05:22:39 +0000 (01:22 -0400)]
Merge pull request #6052 from liewegas/wip-13098
osd: fix full request handling
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Sat, 26 Sep 2015 05:22:10 +0000 (01:22 -0400)]
Merge pull request #6075 from liewegas/wip-osd-getmap
osd: avoid duplicate MMonGetOSDMap requests
Reviewed-by: Kefu Chai <kchai@redhat.com>
Dan Mick [Fri, 25 Sep 2015 18:14:51 +0000 (11:14 -0700)]
Merge pull request #6077 from liewegas/wip-qa
qa: http://ceph.com/qa -> http://download.ceph.com/qa
also some ceph.com/git -> git.ceph.com and a few line-endings - dmick
Reviewed-by: Dan Mick <dmick@redhat.com>
Sage Weil [Fri, 25 Sep 2015 18:01:19 +0000 (14:01 -0400)]
Revert "osd: new pool settings: scrub intervals"
This reverts commit
30810da4b573b3c7e679bc66eaa29b70246538cb .
After some discussion we have decided it is better to build a generic
dictionary in pg_pool_t to store infrequently used per-pool properties.
Signed-off-by: Sage Weil <sage@redhat.com>
Gregory Farnum [Fri, 25 Sep 2015 15:40:51 +0000 (08:40 -0700)]
Merge pull request #6083 from jcsp/wip-mds-allow-star
ceph-create-keys: set mds "allow *"
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
John Spray [Fri, 25 Sep 2015 15:07:59 +0000 (16:07 +0100)]
ceph-create-keys: set mds "allow *"
So that 'tell' works out of the box.
Signed-off-by: John Spray <john.spray@redhat.com>
Kefu Chai [Fri, 25 Sep 2015 13:41:48 +0000 (21:41 +0800)]
Merge pull request #5959 from mslovy/wip-current-dev
mon: Fix unnecessary at/near max target warn in ceph -s
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Fri, 25 Sep 2015 13:39:20 +0000 (21:39 +0800)]
Merge pull request #5356 from majianpeng/code-cleanup
osd: cleanup code when met crc error.
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Fri, 25 Sep 2015 13:31:38 +0000 (21:31 +0800)]
Merge pull request #5972 from Jerry7X/master
unsigned type is short for journal max_size,use uint64_t instead
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Fri, 25 Sep 2015 12:59:54 +0000 (08:59 -0400)]
Merge remote-tracking branch 'gh/infernalis'
Sage Weil [Fri, 25 Sep 2015 12:56:02 +0000 (08:56 -0400)]
Merge pull request #6048 from XinzeChi/wip-filestore-qlock
filestore: fix peek_queue for OpSequencer
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 25 Sep 2015 12:53:53 +0000 (08:53 -0400)]
Merge pull request #6040 from liewegas/wip-mon-kv
mon: some fixes for kv backend failures
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Sage Weil [Fri, 25 Sep 2015 12:53:00 +0000 (08:53 -0400)]
Merge pull request #6022 from jdurgin/wip-13032
msg: randomize client nonces
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 25 Sep 2015 12:52:29 +0000 (08:52 -0400)]
Merge pull request #6012 from liewegas/wip-mon
mon: misc scaling fixes
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
John Spray [Fri, 25 Sep 2015 12:23:01 +0000 (13:23 +0100)]
client: fix quote enforcement on subdir mounts
While we don't allow setting quotas on the global
filesystem root, the inode which is root from the
client mount's point of view might have a quota.
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Fri, 25 Sep 2015 12:02:56 +0000 (13:02 +0100)]
client: refactor quota check functions
Generalise the path traversal into check_quota_condition
and then call that from each of file_exceeded, bytes_exceeded,
bytes_approaching with the appropriate lambda function.
Motivated by fixing the path traversal and wanting to
only fix it in one place.
Signed-off-by: John Spray <john.spray@redhat.com>
Kefu Chai [Fri, 25 Sep 2015 11:16:08 +0000 (19:16 +0800)]
Merge pull request #6027 from wido/mirror-docs
docs: Update docs to make it clear that there are mirrors worldwide
Reviewed-by: Kefu Chai <kchai@redhat.com>
Ruifeng Yang [Fri, 25 Sep 2015 04:42:28 +0000 (12:42 +0800)]
Objecter: repeated free op->ontimeout.
repeated free op->ontimeout in SafeTimer::timer_thread::callback->complete
Fixes: #13208
Signed-off-by: Ruifeng Yang <yangruifeng.09209@h3c.com>
Ruifeng Yang [Fri, 25 Sep 2015 02:18:11 +0000 (10:18 +0800)]
Objecter: maybe access wild pointer(op) in _op_submit_with_budget.
look at "after giving up session lock it can be freed at any time by response handler" in _op_submit,
so the _op_submit_with_budget::op maybe is wild after call _op_submit.
Fixes: #13208
Signed-off-by: Ruifeng Yang <yangruifeng.09209@h3c.com>
Sage Weil [Thu, 24 Sep 2015 23:27:16 +0000 (19:27 -0400)]
osd/ReplicatedPG: fix ENOSPC checking
1. We need to return ENOSPC *before* we apply our side-effects to the obc
cache in finish_ctx().
2. Consider object count changes too, not just bytes.
3. Consider cluster full flag, not just the pool flag.
4. Reply only if FULL_TRY; silently drop ops that were sent despite the
full flag.
Fixes: #13098
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 23 Sep 2015 14:19:46 +0000 (10:19 -0400)]
osd/osd_types: remove [pool_]last_epoch_marked_full from OSDSuperblock
This is no longer used or needed.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 23 Sep 2015 14:26:25 +0000 (10:26 -0400)]
osd: remove buggy [pool_]last_map_marked_full tracking
This is buggy (we reset the pool epoch each time it remains full instead
of only on the initial transition from non-full to full) and now unused.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 23 Sep 2015 14:25:30 +0000 (10:25 -0400)]
osd: do full check in do_op
1. The current pool_last_map_marked_full tracking is buggy.
2. We need to recheck this each time we consider the op, not just when it
is received off the wire. Otherwise, we might get a message, queue it
for some reason, get a map indicating the cluster or pool is full, and
then requeue and process the op instead of discarding it.
3. For now, silently drop ops when failsafe check fails. This will lead to
stalled client IO. This needs a more robust fix.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 23 Sep 2015 14:14:47 +0000 (10:14 -0400)]
osd/PG: set last_epoch_marked_full on map advance
This will get persisted and shared.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 23 Sep 2015 14:01:35 +0000 (10:01 -0400)]
osd/osd_types: add last_epoch_marked_full to pg_history_t
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 24 Sep 2015 23:02:21 +0000 (19:02 -0400)]
osdc/Objecter: set FULL_FORCE flag when honor_full is false
This currenty only applies to the MDS. Eventually we can remove the
OSD MDS checks once we are confident all MDS instances are new enough
to set this flag.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 24 Sep 2015 22:40:51 +0000 (18:40 -0400)]
osd: add FULL_TRY and FULL_FORCE rados op flags
FULL_TRY = try to do the op; ENOSPC if it results in a net increase is
space. client must cope.
FULL_FORCE = do the op even if it consumes space. The MDS will use this.
We should restrict this based on the OSD cap (* vs w, probably).
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 24 Sep 2015 22:36:57 +0000 (18:36 -0400)]
qa: https://ceph.com/git -> https://git.ceph.com
Signed-off-by: Sage Weil <sage@redhat.com>
Josh Durgin [Thu, 24 Sep 2015 22:35:13 +0000 (18:35 -0400)]
Merge pull request #6031 from s09816/master
librbd:reads larger than cache size hang.
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Thu, 24 Sep 2015 22:10:46 +0000 (18:10 -0400)]
qa: http://ceph.com/qa -> http://download.ceph.com/qa
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 24 Sep 2015 15:38:41 +0000 (11:38 -0400)]
osd/PG: compensate for sloppy hobject scrub bounds from hammer
Hammer is sloppy about the hobject_t's it uses for the scrub bounds in that
the pool isn't set. (Hammer FileStore doesn't care, but post-hammer is
much more careful about this sort of thing.)
Compensate by setting the pool on any scrub messages we receive.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 24 Sep 2015 15:36:30 +0000 (11:36 -0400)]
osd: avoid duplicate MMonGetOSDMap requests
These are relatively expensive (we grab the full map from the mon) so we
should avoid duplicating our requests.
Track which requests are in flight. Only send a new request when new
maps are asked for. Resend requests when there is a new mon session.
Signed-off-by: Sage Weil <sage@redhat.com>
Loic Dachary [Thu, 24 Sep 2015 14:19:43 +0000 (16:19 +0200)]
Merge pull request #6072 from yuyuyu101/update-org
Update org
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Haomai Wang [Thu, 24 Sep 2015 13:58:51 +0000 (21:58 +0800)]
Update Xinze affinity
Signed-off-by: Haomai Wang <haomai@xsky.com>
Kefu Chai [Thu, 24 Sep 2015 13:57:31 +0000 (21:57 +0800)]
Merge pull request #6066 from dachary/wip-ceph-detect-init
build/ops: ceph-detect-init must ignore .cache
Reviewed-by: Kefu Chai <kchai@redhat.com>
Haomai Wang [Thu, 24 Sep 2015 13:56:17 +0000 (21:56 +0800)]
Update Chen Min affinity
Signed-off-by: Haomai Wang <haomai@xsky.com>
Haomai Wang [Thu, 24 Sep 2015 13:55:21 +0000 (21:55 +0800)]
Update Tianshan affinity
Signed-off-by: Haomai Wang <haomai@xsky.com>
Haomai Wang [Thu, 10 Sep 2015 04:11:22 +0000 (12:11 +0800)]
Update Haomai Wang affinity
Signed-off-by: Haomai Wang <haomai@xsky.com>
Wido den Hollander [Tue, 22 Sep 2015 09:09:02 +0000 (11:09 +0200)]
docs: Update docs to make it clear that there are mirrors worldwide
John Spray [Thu, 24 Sep 2015 12:10:46 +0000 (13:10 +0100)]
mds: fix error reformatting subtreemap_test events
Rare outside of vstart clusters, but if someone did
ever have one of these events in their journal and
try to update to latest ceph, they would end up
with bogus expire_pos on the reformatted events.
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Thu, 24 Sep 2015 12:08:43 +0000 (13:08 +0100)]
tools/cephfs: detect malformed ESubtreeMap::expire_pos
Signed-off-by: John Spray <john.spray@redhat.com>
Kefu Chai [Thu, 24 Sep 2015 09:23:03 +0000 (17:23 +0800)]
Merge pull request #6063 from dachary/wip-tar-v7
build/ops: make dist needs files with names > 99 characters
Reviewed-by: Kefu Chai <kchai@redhat.com>
Loic Dachary [Thu, 24 Sep 2015 08:54:35 +0000 (10:54 +0200)]
build/ops: ceph-detect-init must ignore .cache
In case the test fails, it may leave files behind:
src/ceph-detect-init/.cache/v/cache/lastfailed
Signed-off-by: Loic Dachary <ldachary@redhat.com>
Orit Wasserman [Thu, 24 Sep 2015 08:08:13 +0000 (10:08 +0200)]
Merge pull request #5694 from guce/rgw_improve_key_operate
rgw: improve convenience for key operate.
Lu Shi [Thu, 24 Sep 2015 08:02:41 +0000 (16:02 +0800)]
librbd:reads larger than cache size hang.
Fixes:#13164
Signed-off-by: Lu Shi <shi.lu@h3c.com>
Loic Dachary [Thu, 24 Sep 2015 05:53:38 +0000 (07:53 +0200)]
build/ops: make dist needs files with names > 99 characters
When running make distdir=
ceph-9.0.3-1870-gfd861bb dist, a few files
have names longer than 99 characters and discarded, which then causes
the resulting tarbal to be incomplete:
tar:
ceph-9.0.3-1870-gfd861bb /src/rocksdb/utilities/write_batch_with_index/write_batch_with_index_internal.cc: file name is too long (max 99); not dumped
tar:
ceph-9.0.3-1870-gfd861bb /src/rocksdb/utilities/write_batch_with_index/write_batch_with_index_internal.h: file name is too long (max 99); not dumped
Use the tar-ustar format instead of the legacy v7
format (http://www.gnu.org/software/automake/manual/automake.html#Options). It
is unlikely machines with a C++11 compiler also have an antique tar
binary that would only support v7.
Signed-off-by: Loic Dachary <ldachary@redhat.com>
Xinze Chi [Wed, 23 Sep 2015 11:26:00 +0000 (19:26 +0800)]
filestore: fix peek_queue for OpSequencer
Fixes: #13209
Signed-off-by: Xinze Chi <xinze@xsky.com>
Sage Weil [Wed, 23 Sep 2015 21:00:48 +0000 (17:00 -0400)]
Merge pull request #6053 from ceph/wip-cmake-dang
Wip cmake dang
Sage Weil [Wed, 23 Sep 2015 20:59:06 +0000 (16:59 -0400)]
Merge pull request #6056 from guangyy/wip-13198
osd: print min_last_epoch_clean along with pg dump
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 23 Sep 2015 19:08:22 +0000 (15:08 -0400)]
Merge remote-tracking branch 'gh/wip-aarch64'
Guang Yang [Wed, 23 Sep 2015 15:58:02 +0000 (15:58 +0000)]
osd: print min_last_epoch_clean along with pg dump
Fixes: 13198
Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
Sage Weil [Wed, 23 Sep 2015 14:58:01 +0000 (10:58 -0400)]
mon/Elector: do a trivial write on every election cycle
Currently we already do a small write when the *first* election in
a round happens (to update the election epoch). If the backend
happens to fail while we are already in the midst of elections,
however, we may continue to call elections without verifying we
are still writeable.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 23 Sep 2015 14:58:13 +0000 (10:58 -0400)]
mon/MonitorDBStore: assert/crash if there is a write error
Do this globally intead of relying on teh zillion mon callers to
check the error code. There are no cases where we want to
tolerate a commit failure.
Fixes: #13089
Signed-off-by: Sage Weil <sage@redhat.com>
Daniel Gryniewicz [Mon, 21 Sep 2015 16:52:02 +0000 (12:52 -0400)]
CMake - fix check for UDEV
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
Daniel Gryniewicz [Mon, 21 Sep 2015 16:44:28 +0000 (12:44 -0400)]
CMake - fix check for FUSE
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
Daniel Gryniewicz [Mon, 21 Sep 2015 16:29:51 +0000 (12:29 -0400)]
CMake - add check for libedit
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
Daniel Gryniewicz [Mon, 21 Sep 2015 16:25:05 +0000 (12:25 -0400)]
CMake - fix check for Snappy
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
Daniel Gryniewicz [Mon, 21 Sep 2015 16:18:43 +0000 (12:18 -0400)]
CMake - add check for XFS
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
Daniel Gryniewicz [Mon, 21 Sep 2015 15:59:30 +0000 (11:59 -0400)]
CMake - fix check for AIO
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
Daniel Gryniewicz [Mon, 21 Sep 2015 15:52:48 +0000 (11:52 -0400)]
CMake - fix check for blkid
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
Daniel Gryniewicz [Mon, 21 Sep 2015 15:50:45 +0000 (11:50 -0400)]
CMake - add check for libcurl
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
Daniel Gryniewicz [Mon, 21 Sep 2015 15:42:53 +0000 (11:42 -0400)]
CMake - fix check for fcgi
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
Daniel Gryniewicz [Mon, 21 Sep 2015 15:37:18 +0000 (11:37 -0400)]
CMake - add check for libuuid
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
Daniel Gryniewicz [Mon, 21 Sep 2015 15:20:19 +0000 (11:20 -0400)]
CMake - fix check for leveldb
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
Daniel Gryniewicz [Mon, 21 Sep 2015 15:10:07 +0000 (11:10 -0400)]
CMake - fix check for expat
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
Daniel Gryniewicz [Mon, 21 Sep 2015 15:08:19 +0000 (11:08 -0400)]
CMake - Add check for keyutils
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
Daniel Gryniewicz [Mon, 21 Sep 2015 14:57:26 +0000 (10:57 -0400)]
CMake - fix check for NSS
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
Daniel Gryniewicz [Mon, 21 Sep 2015 14:37:19 +0000 (10:37 -0400)]
CMake - fix libatomic_ops and gperftools checks
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
Sage Weil [Wed, 23 Sep 2015 14:46:51 +0000 (10:46 -0400)]
Merge remote-tracking branch 'gh/infernalis'
Sage Weil [Wed, 23 Sep 2015 12:20:39 +0000 (08:20 -0400)]
arch/arm: s/false/0/
arch/arm.c: In function 'ceph_arch_arm_probe':
arch/arm.c:54:28: error: 'false' undeclared (first use in this function)
ceph_arch_aarch64_crc32 = false; // sorry!
^
arch/arm.c:54:28: note: each undeclared identifier is reported only once for each function it appears in
Signed-off-by: Sage Weil <sage@redhat.com>
guce [Wed, 23 Sep 2015 01:52:06 +0000 (09:52 +0800)]
rgw: improve convenience for key operate.
1.key-type assignments based on context if it wasn't specified
In user operate context, key-type assignment to KEY_TYPE_S3
In subuser operate context, key-type assignment to KEY_TYPE_SWIFT
In key operate context, key-type assignment based on user type
2.fix RGWSubUserPool::add()
When create subuser generate secret by default
3.fix RGWAccessKeyPool::generate_key()
Avoid wrong key's username when create user and subuser at the same time
Check empty secret
Signed-off-by: Ce Gu <guce@h3c.com>
Sage Weil [Tue, 22 Sep 2015 19:12:17 +0000 (15:12 -0400)]
Merge pull request #6037 from liewegas/wip-12407
init-radosgw: fix restart w/ multiple instances
Reviewed-by: Pavan Rallabhandi <pavan.rallabhandi@sandisk.com>
Orit Wasserman [Tue, 22 Sep 2015 18:29:10 +0000 (20:29 +0200)]
Merge pull request #5928 from ceph/wip-12819-infernalis
Wip 12819 infernalis
Loic Dachary [Tue, 22 Sep 2015 18:27:57 +0000 (20:27 +0200)]
Merge pull request #6006 from dachary/wip-12936-shec
erasure-code: workaround i386 optimization bug with SHEC
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 22 Sep 2015 18:12:02 +0000 (14:12 -0400)]
init-radosgw: specify pid file to start-stop-daemon
This fixes restart when multiple instances are running.
Fixes: #12407
Tested-by: Pavan Rallabhandi <pavan.rallabhandi@sandisk.com>
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 22 Sep 2015 18:04:44 +0000 (14:04 -0400)]
Merge remote-tracking branch 'gh/infernalis'
David Zafman [Tue, 22 Sep 2015 16:32:18 +0000 (09:32 -0700)]
Merge pull request #5922 from trociny/wip-pool-set-noscrub
osd: per pool control for scrub and deep-scrub
Reviewed-by: David Zafman <dzafman@redhat.com>
Kefu Chai [Tue, 22 Sep 2015 15:54:32 +0000 (23:54 +0800)]
Merge pull request #5846 from xiexingguo/xxg-wip-13002
msg/simple: start over after fails to bind a port in specified range
Reviewed-by: Kefu Chai <kchai@redhat.com>
Loic Dachary [Mon, 21 Sep 2015 13:36:54 +0000 (15:36 +0200)]
erasure-code: workaround i386 optimization bug with SHEC
http://tracker.ceph.com/issues/12936 Fixes: #12936
Signed-off-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Tue, 22 Sep 2015 14:29:16 +0000 (16:29 +0200)]
Merge pull request #5999 from dachary/wip-13000-ceph-disk
ceph-disk: fixes various race conditions
Reviewed-by: Sage Weil <sage@redhat.com>
Samuel Just [Tue, 22 Sep 2015 14:24:27 +0000 (07:24 -0700)]
Merge pull request #6008 from liewegas/wip-13190
osd/ReplicatedPG: tolerate promotion completion with stopped agent
Reviewed-by: Samuel Just <sjust@redhat.com>
Yan, Zheng [Tue, 22 Sep 2015 08:29:49 +0000 (16:29 +0800)]
journaler: detect unexpected holes in journal objects
Fixes: #13167
Signed-off-by: Yan, Zheng <zyan@redhat.com>
Sage Weil [Tue, 22 Sep 2015 13:32:08 +0000 (09:32 -0400)]
Merge pull request #6011 from liewegas/wip-systemd
systemd: increase nproc ulimit