]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agoMerge pull request #10038 from tchaikov/wip-16297-hammer 10464/head
Nathan Cutler [Wed, 27 Jul 2016 06:28:38 +0000 (08:28 +0200)]
Merge pull request #10038 from tchaikov/wip-16297-hammer

mon: Monitor: validate prefix on handle_command()

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #9090 from tchaikov/wip-13990-hammer
Nathan Cutler [Tue, 26 Jul 2016 17:08:23 +0000 (19:08 +0200)]
Merge pull request #9090 from tchaikov/wip-13990-hammer

hammer: osd: remove all stale osdmaps in handle_osd_map()

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #10227 from SUSE/wip-15081-hammer
Nathan Cutler [Mon, 25 Jul 2016 19:44:14 +0000 (21:44 +0200)]
Merge pull request #10227 from SUSE/wip-15081-hammer

hammer: When logging to a file fails, ceph logs excessively to stderr

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoMerge pull request #9893 from Vicente-Cheng/wip-16430-hammer
Nathan Cutler [Mon, 25 Jul 2016 19:43:49 +0000 (21:43 +0200)]
Merge pull request #9893 from Vicente-Cheng/wip-16430-hammer

hammer: OSDMonitor: drop pg temps from not the current primary

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #9238 from SUSE/wip-15962-hammer
Nathan Cutler [Mon, 25 Jul 2016 19:42:54 +0000 (21:42 +0200)]
Merge pull request #9238 from SUSE/wip-15962-hammer

hammer: ceph-osd valgrind invalid reads/writes

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoMerge pull request #8849 from SUSE/wip-14326-hammer
Nathan Cutler [Mon, 25 Jul 2016 19:42:06 +0000 (21:42 +0200)]
Merge pull request #8849 from SUSE/wip-14326-hammer

hammer: osd/PGLog.h: 88: FAILED assert(rollback_info_trimmed_to == head)

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoMerge pull request #8845 from SUSE/wip-15647-hammer
Nathan Cutler [Mon, 25 Jul 2016 19:40:57 +0000 (21:40 +0200)]
Merge pull request #8845 from SUSE/wip-15647-hammer

hammer: osd: rados cppool omap to ec pool crashes osd

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #8470 from dachary/wip-15403-api-test-timeout-hammer
Loic Dachary [Mon, 25 Jul 2016 13:05:54 +0000 (15:05 +0200)]
Merge pull request #8470 from dachary/wip-15403-api-test-timeout-hammer

hammer: tests: be more generous with test timeout

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #9977 from shun-s/hammer
Nathan Cutler [Mon, 25 Jul 2016 13:05:31 +0000 (15:05 +0200)]
Merge pull request #9977 from shun-s/hammer

replcatedBackend: delete one of the repeated op->mark_started in ReplicatedBackend::sub_op_modify_impl

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #8960 from badone/wip-hammer-rados-bench-units
Nathan Cutler [Mon, 25 Jul 2016 10:51:45 +0000 (12:51 +0200)]
Merge pull request #8960 from badone/wip-hammer-rados-bench-units

hammer: Add units to rados bench output and clean up formatting

Reviewed-by: Nathan Cutler <ncutler@suse.com>
9 years agoOSDMonitor: drop pg temp from sources other than the current primary 9893/head
Samuel Just [Thu, 2 Jun 2016 17:43:17 +0000 (10:43 -0700)]
OSDMonitor: drop pg temp from sources other than the current primary

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

change:
            use NULL to replace the nullptr because we don't have C++11

9 years agoosd: reset session->osdmap if session is not waiting for a map anymore 9090/head
Kefu Chai [Thu, 12 May 2016 12:28:11 +0000 (20:28 +0800)]
osd: reset session->osdmap if session is not waiting for a map anymore

we should release the osdmap reference once we are done with it,
otherwise we might need to wait very long to update that reference with
a newer osdmap ref. this appears to be an OSDMap leak: it is held by an
quiet OSD::Session forever.

the osdmap is not reset in OSD::session_notify_pg_create(), because its
only caller is wake_pg_waiters(), which will call
dispatch_session_waiting() later. and dispatch_session_waiting() will
check the session->osdmap, and will also reset the osdmap if
session->waiting_for_pg.empty().

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

9 years agolog: do not repeat errors to stderr 10227/head
Sage Weil [Thu, 10 Mar 2016 14:50:07 +0000 (09:50 -0500)]
log: do not repeat errors to stderr

If we get an error writing to the log, log it only once to stderr.
This avoids generating, say, 72 GB of ENOSPC errors in
teuthology.log when /var/log fills up.

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

Conflicts:
src/log/Log.cc (drop m_uid and m_gid which are not used in hammer;
order of do_stderr, do_syslog, do_fd conditional blocks is reversed in
hammer; drop irrelevant speed optimization code from
5bfe05aebfefdff9022f0eb990805758e0edb1dc)

9 years agoMerge pull request #9407 from SUSE/wip-15833-hammer
Yehuda Sadeh [Thu, 7 Jul 2016 17:16:31 +0000 (10:16 -0700)]
Merge pull request #9407 from SUSE/wip-15833-hammer

hammer: RGW :: Subset of uploaded objects via radosgw are unretrievable when using erasure coded pool

9 years agoMerge pull request #8475 from Vicente-Cheng/wip-15343-hammer
Orit Wasserman [Wed, 6 Jul 2016 18:25:20 +0000 (20:25 +0200)]
Merge pull request #8475 from Vicente-Cheng/wip-15343-hammer

hammer: Multipart ListPartsResult has missing quotes on ETag
Reviewed-bu: Orit Wasserman <owasserm@redhat.com>

9 years agoreplcatedBackend: delete one useless op->mark_started as there are two in ReplicatedB... 9977/head
shun-s [Tue, 28 Jun 2016 07:30:16 +0000 (15:30 +0800)]
replcatedBackend: delete one useless op->mark_started as there are two in ReplicatedBackend::sub_op_modify_impl
delete one mark_start event as there are two same op->mark_started  in ReplicatedBackend::sub_op_modify_impl
Fixes: http://tracker.ceph.com/issues/16572
Signed-off-by: shun-s <song.shun3@zte.com.cn>
9 years agomon: Monitor: validate prefix on handle_command() 10038/head
Kefu Chai [Thu, 30 Jun 2016 05:24:22 +0000 (13:24 +0800)]
mon: Monitor: validate prefix on handle_command()

Fixes: http://tracker.ceph.com/issues/16297
Signed-off-by: You Ji <youji@ebay.com>
(cherry picked from commit 7cb3434fed03a5497abfd00bcec7276b70df0654)

Conflicts:
    src/mon/Monitor.cc (the signature of Monitor::reply_command()
                        changed a little bit in master, so adapt the
                        commit to work with the old method)

9 years agoMerge pull request #8538 from Vicente-Cheng/wip-15360-hammer
Nathan Cutler [Mon, 27 Jun 2016 15:51:19 +0000 (17:51 +0200)]
Merge pull request #8538 from Vicente-Cheng/wip-15360-hammer

hammer: Linking to -lrbd causes process startup times to balloon

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoPipe: take a ref to existing while we are waiting 9238/head
Samuel Just [Thu, 12 May 2016 23:57:49 +0000 (16:57 -0700)]
Pipe: take a ref to existing while we are waiting

Otherwise, if it is reaped while we are waiting, it'll be a
use-after-free.

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

Conflicts:
    src/msg/simple/Pipe.cc: nullptr changed to 0 because hammer is not compiled
    with -std=c++11

9 years agoMerge pull request #9722 from trociny/wip-16289-hammer
Mykola Golub [Thu, 16 Jun 2016 05:26:00 +0000 (08:26 +0300)]
Merge pull request #9722 from trociny/wip-16289-hammer

hammer: qa/workunits/rbd: respect RBD_CREATE_ARGS environment variable

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoqa/workunits/rbd: respect RBD_CREATE_ARGS environment variable 9722/head
Mykola Golub [Tue, 14 Jun 2016 12:28:06 +0000 (15:28 +0300)]
qa/workunits/rbd: respect RBD_CREATE_ARGS environment variable

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

9 years agoMerge pull request #8113 from Vicente-Cheng/wip-15023-hammer
Orit Wasserman [Tue, 7 Jun 2016 13:48:00 +0000 (15:48 +0200)]
Merge pull request #8113 from Vicente-Cheng/wip-15023-hammer

hammer: rgw: user quota may not adjust on bucket removal
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #9277 from ceph/wip-split-lfn-hammer
Samuel Just [Mon, 6 Jun 2016 19:42:14 +0000 (12:42 -0700)]
Merge pull request #9277 from ceph/wip-split-lfn-hammer

Hammer LFN collection split fix: backport of http://tracker.ceph.com/issues/14766

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9521 from ceph/revert-9496-wip-16149-hammer
Josh Durgin [Mon, 6 Jun 2016 15:19:23 +0000 (08:19 -0700)]
Merge pull request #9521 from ceph/revert-9496-wip-16149-hammer

Revert "hammer: Scrub error: 0/1 pinned"

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoRevert "hammer: Scrub error: 0/1 pinned" 9521/head
Sage Weil [Mon, 6 Jun 2016 15:15:54 +0000 (11:15 -0400)]
Revert "hammer: Scrub error: 0/1 pinned"

9 years agoMerge pull request #9496 from Vicente-Cheng/wip-16149-hammer
Sage Weil [Mon, 6 Jun 2016 12:46:45 +0000 (08:46 -0400)]
Merge pull request #9496 from Vicente-Cheng/wip-16149-hammer

hammer: Scrub error: 0/1 pinned

9 years agoMerge pull request #8987 from dreamhost/hammer-wip-pr7712
Orit Wasserman [Mon, 6 Jun 2016 09:39:34 +0000 (11:39 +0200)]
Merge pull request #8987 from dreamhost/hammer-wip-pr7712

hammer: rgw: S3: set EncodingType in ListBucketResult
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoReplicatedPG: adjust num_pinned in _delete_oid 9496/head
Samuel Just [Fri, 20 May 2016 20:59:10 +0000 (13:59 -0700)]
ReplicatedPG: adjust num_pinned in _delete_oid

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

9 years agorgw: handle stripe transition when flushing final pending_data_bl 9407/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)

Conflicts:
src/rgw/rgw_rados.cc (hammer write_data() takes rgw_obj reference as
4th argument, hammer throttle_data() takes rgw_obj as 2nd argument)

9 years agoMerge pull request #9240 from yehudasa/wip-15886-hammer
Sage Weil [Sat, 21 May 2016 18:18:25 +0000 (14:18 -0400)]
Merge pull request #9240 from yehudasa/wip-15886-hammer

rgw: keep track of written_objs correctly

9 years agorgw: keep track of written_objs correctly 9240/head
Yehuda Sadeh [Mon, 16 May 2016 21:35:12 +0000 (14:35 -0700)]
rgw: keep track of written_objs correctly

Fixes: http://tracker.ceph.com/issues/15886
Only add a rados object to the written_objs list if the write
was successful. Otherwise if the write will be canceled for some
reason, we'd remove an object that we didn't write to. This was
a problem in a case where there's multiple writes that went to
the same part. The second writer should fail the write, since
we do an exclusive write. However, we added the object's name
to the written_objs list anyway, which was a real problem when
the old processor was disposed (as it was clearing the objects).

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

9 years agoosd: remove all stale osdmaps in handle_osd_map()
Kefu Chai [Mon, 9 May 2016 07:01:46 +0000 (15:01 +0800)]
osd: remove all stale osdmaps in handle_osd_map()

in a large cluster, there are better chances that the OSD fails to trim
the cached osdmap in a timely manner. and sometimes, it is just unable
to keep up with the incoming osdmap if skip_maps, so the osdmap cache
can keep building up to over 250GB in size. in this change

* publish_superblock() before trimming the osdmaps, so other osdmap
  consumers of OSDService.superblock won't access the osdmaps being
  removed.
* trim all stale osdmaps in batch of conf->osd_target_transaction_size
  if skip_maps is true. in my test, it happens when the osd only
  receives the osdmap from monitor occasionally because the osd happens
  to be chosen when monitor wants to share a new osdmap with a random
  osd.
* always use dedicated transaction(s) for trimming osdmaps. so even in
  the normal case where we are able to trim all stale osdmaps in a
  single batch, a separated transaction is used. we can piggy back
  the commits for removing maps, but we keep it this way for simplicity.
* use std::min() instead MIN() for type safety

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

Conflicts:
    remove the C++11ism

9 years agoosd: populate the trim_thru epoch using MOSDMap.oldest_map
Kefu Chai [Wed, 16 Mar 2016 13:15:35 +0000 (21:15 +0800)]
osd: populate the trim_thru epoch using MOSDMap.oldest_map

instead of filling MOSDMap with the local oldest_map, we share
the maximum MOSDMap.oldest_map received so far with peers. That
way one OSD's failure to trim won't prevent it from sharing with
others that they are allowed to trim.

Fixes: #13990
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 9789c29fe0f82b236703f7ae4d356251fde3a46f)

Conflict: use atomic_t instead of std::atomic<>

9 years agoMerge pull request #9164 from liewegas/wip-osdmapcrc-hammer
Sage Weil [Wed, 18 May 2016 21:02:26 +0000 (17:02 -0400)]
Merge pull request #9164 from liewegas/wip-osdmapcrc-hammer

osd: dump full map bl at 20 when crc doesn't match

9 years agoosd: dump full map bl at 20 when crc doesn't match 9164/head
Sage Weil [Sun, 6 Sep 2015 17:56:38 +0000 (13:56 -0400)]
osd: dump full map bl at 20 when crc doesn't match

This will help us debug cases where the encoding doesn't match due
to a bug.

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

9 years agoobj_bencher: cosmetic display fixes 8960/head
Dmitry Yatsushkevich [Mon, 23 Mar 2015 18:05:44 +0000 (11:05 -0700)]
obj_bencher: cosmetic display fixes

fix indents in output
change `snprintf' to `setprecision'

Signed-off-by: Dmitry Yatsushkevich <dyatsushkevich@mirantis.com>
(cherry picked from commit ddb422f40394ec2f4fc4a6a6cff49e43538121a9)
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
9 years agocommon: Add space between timestamp and "min lat:" in bench output
Brad Hubbard [Fri, 6 May 2016 05:05:42 +0000 (15:05 +1000)]
common: Add space between timestamp and "min lat:" in bench output

This change is taken from 069d95eaf49cadaa9a8fa1fa186455944a50ec7d
but I did not want to cherry-pick that patch since the rest of it
is purely cosmetic and would be unlikely to apply cleanly.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
9 years agoMerge pull request #8535 from asheplyakov/bug-14512-hammer
Loic Dachary [Mon, 16 May 2016 11:02:44 +0000 (13:02 +0200)]
Merge pull request #8535 from asheplyakov/bug-14512-hammer

hammer: rbd snap rollback: restore the link to parent

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9107 from SUSE/wip-15867-hammer
Loic Dachary [Thu, 12 May 2016 21:17:51 +0000 (23:17 +0200)]
Merge pull request #9107 from SUSE/wip-15867-hammer

hammer: ceph-disk s/by-parttype-uuid/by-parttypeuuid/

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agosrc/test/objectstore/store_test.cc: fix shards for new tests 9277/head
Samuel Just [Thu, 12 May 2016 20:50:58 +0000 (13:50 -0700)]
src/test/objectstore/store_test.cc: fix shards for new tests

This didn't matter on master/jewel, but in hammer, keyvaluestore
asserts that gen != NO_GEN => shard != NO_SHARD.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agodoc: s/by-parttype-uuid/by-parttypeuuid/ in ceph-disk 9107/head
Nathan Cutler [Thu, 12 May 2016 18:06:06 +0000 (20:06 +0200)]
doc: s/by-parttype-uuid/by-parttypeuuid/ in ceph-disk

Fixes: http://tracker.ceph.com/issues/15867
Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years ago0.94.7 v0.94.7
Jenkins Build Slave User [Tue, 10 May 2016 14:47:39 +0000 (14:47 +0000)]
0.94.7

9 years agostore_test: improve synthetic coverage of the ec stash case
Samuel Just [Sat, 12 Mar 2016 01:02:15 +0000 (17:02 -0800)]
store_test: improve synthetic coverage of the ec stash case

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit f3a78e046d54260de01a4d1db8e104130e35cf42)

Conflicts:
        src/test/objectstore/store_test.cc

9 years agostore_test: improve synthetic test coverage of long object names
Samuel Just [Fri, 11 Mar 2016 22:05:37 +0000 (14:05 -0800)]
store_test: improve synthetic test coverage of long object names

1/2 of objects will now have long names, and we'll shift the region
of the hash space where new objects are created every 1024 objects
created.

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 4b44720f752ebac63454ecd338e2b0c77c8fe501)

Conflicts:
src/test/objectstore/store_test.cc

9 years agoTestRados: make half the objects have long names
Samuel Just [Thu, 10 Mar 2016 23:38:26 +0000 (15:38 -0800)]
TestRados: make half the objects have long names

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 8b64432d07a14df9dfd2ed1314783de16530b1d1)

9 years agoLFNIndex::lfn_translate: consider alt attr as well
Samuel Just [Thu, 10 Mar 2016 23:19:15 +0000 (15:19 -0800)]
LFNIndex::lfn_translate: consider alt attr as well

If the file has an alt attr, there are two possible matching
ghobjects.  We want to make sure we choose the right one for
the short name we have.  If we don't, a split while there are
two objects linking to the same inode will result in one of
the links being orphaned in the source directory, resulting
in #14766.

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 850ce11ea3c4dacc6ff1a3ce7ff37000818267c2)

9 years agoLFNIndex::created: fix return value with failure injection
Samuel Just [Thu, 10 Mar 2016 19:06:06 +0000 (11:06 -0800)]
LFNIndex::created: fix return value with failure injection

See comment for explanation.

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit aec5560887a1c1dbbb5aba822280e2c1e05d5d8f)

9 years agostore_test: add reproducer for #14766
Samuel Just [Thu, 10 Mar 2016 19:03:13 +0000 (11:03 -0800)]
store_test: add reproducer for #14766

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 0fb67c772561aaca9261ac9094b74d7524498f6f)

Conflicts:
        src/test/objectstore/store_test.cc

9 years agoMerge pull request #8979 from athanatos/wip-15655-hammer
Sage Weil [Mon, 9 May 2016 17:55:24 +0000 (13:55 -0400)]
Merge pull request #8979 from athanatos/wip-15655-hammer

OSDMonitor: avoid underflow in reweight-by-utilization if max_change=1

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agohammer: rgw: S3: set EncodingType in ListBucketResult 8987/head
Vitja Makarov [Wed, 17 Feb 2016 10:46:18 +0000 (13:46 +0300)]
hammer: rgw: S3: set EncodingType in ListBucketResult

Signed-off-by: Victor Makarov <vitja.makarov@gmail.com>
(cherry picked from commit d2e281d2beb0a49aae0fd939f9387cb2af2692c8)
X-Github-PR: 7712
Backport: hammer
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
9 years agorados: Add units to rados bench output
Gu Zhongyan [Wed, 30 Dec 2015 08:42:07 +0000 (16:42 +0800)]
rados: Add units to rados bench output

Fixes: #12248
Signed-off-by: Gu Zhongyan <guzhongyan@360.com>
Reviewed-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 669b932934d60bbfa751cebd9340f11bd95e2853)
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
9 years agoMerge pull request #8583 from Vicente-Cheng/wip-15089-hammer
Orit Wasserman [Wed, 4 May 2016 09:37:33 +0000 (11:37 +0200)]
Merge pull request #8583 from Vicente-Cheng/wip-15089-hammer

hammer: Bucket owner isn't changed after unlink/link
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoOSDMonitor: avoid underflow in reweight-by-utilization if max_change=1 8979/head
Samuel Just [Thu, 28 Apr 2016 20:47:48 +0000 (13:47 -0700)]
OSDMonitor: avoid underflow in reweight-by-utilization if max_change=1

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

9 years agoPGLog::rewind_divergent_log: fix rollback_info_trimmed_to before index() 8849/head
Samuel Just [Thu, 3 Dec 2015 01:20:19 +0000 (17:20 -0800)]
PGLog::rewind_divergent_log: fix rollback_info_trimmed_to before index()

Fixes: #13965
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 053ee919059b2671d40110e8dff8615dc13d34e0)

9 years agoTestPGLog: add test for 13965
Samuel Just [Thu, 3 Dec 2015 01:17:57 +0000 (17:17 -0800)]
TestPGLog: add test for 13965

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 66c7246491f4b6e5b95d80cc93c9157725a1a778)

9 years agoosd/Replicated: For CEPH_OSD_OP_WRITE, set data digest. 8845/head
Jianpeng Ma [Sun, 22 Mar 2015 14:07:24 +0000 (22:07 +0800)]
osd/Replicated: For CEPH_OSD_OP_WRITE, set data digest.

Add two cases which can add data digest for OP_WRITE:
a: offset = 0, and length > original size
b: offset = original size, and original has data_digest.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit c7702bf85d3617b3e1c6619b8ebeff34932fc3e4)

9 years agoosd/ReplicatedPG: For obj has omap, it mean have omap data or omap header or have...
Jianpeng Ma [Mon, 23 Mar 2015 01:54:52 +0000 (09:54 +0800)]
osd/ReplicatedPG: For obj has omap, it mean have omap data or omap header or have both.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit fc51ce2a837e8e878d46d8ca54531aa7bd5d01b2)

9 years agohammer: rbd snap rollback: restore the link to parent 8535/head
Alexey Sheplyakov [Mon, 11 Apr 2016 11:16:48 +0000 (14:16 +0300)]
hammer: rbd snap rollback: restore the link to parent

So snapshot, flatten, rollback of a cloned image does not loose any data

Fixes: #14512
Signed-off-by: Alexey Sheplyakov <asheplyakov@mirantis.com>
9 years agorgw:bucket link now set the bucket.instance acl 8583/head
Aran85 [Mon, 28 Sep 2015 00:23:22 +0000 (08:23 +0800)]
rgw:bucket link now set the bucket.instance acl

Fixes: #11076
Signed-off-by: Zengran Zhang <zhangzengran@h3c.com>
(cherry picked from commit 4d59b1d36f8924290c3ecb5b7608747191470188)

Conflicts:

src/rgw/rgw_bucket.cc
            1. Do not use the rgw_user structure and remove the tenant parameter that describes as below
            2. user_id is not used so just remove the line
            3. instead of system_obj_set_attr you can use the method set_attr

Backport Change:
We do not use the rgw_user structure and remove the `tenant` parameter
because this feature is not introduced on hammer version.
The rgw multi-tenant feature is introduced on pr#6784 (https://github.com/ceph/ceph/pull/6784)
This feature is supported from v10.0.2 and later version.

9 years agocommon/Cycles: Do not initialize Cycles globally. 8538/head
Richard W.M. Jones [Mon, 21 Mar 2016 14:24:35 +0000 (14:24 +0000)]
common/Cycles: Do not initialize Cycles globally.

Move initialization to the few tests that actually use it.

Fixes: http://tracker.ceph.com/issues/15225
Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
(cherry picked from commit 1c2831a2c1277c69f9649200d74a75c04a4b0296)

  Conflicts:
src/test/msgr/perf_msgr_client.cc
src/test/msgr/perf_msgr_server.cc
src/test/perf_local.cc
            These three files were not introduced on hammer, just remove

9 years agorgw: fix compiling error 8475/head
xie xingguo [Thu, 31 Mar 2016 11:48:38 +0000 (19:48 +0800)]
rgw: fix compiling error

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 535eb0e608f3bf6b7c561f277e9977b91ab97b48)

9 years agorgw: Multipart ListPartsResult ETag quotes
Robin H. Johnson [Thu, 31 Mar 2016 06:24:40 +0000 (06:24 +0000)]
rgw: Multipart ListPartsResult ETag quotes

ListPartsResult output has always missed quotes on the ETag since it was
first committed.

Fixes: #15334
Backports: hammer, infernalis
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
(cherry picked from commit a58b774e72cc1613d62e10b25322d6d15e9d2899)

9 years agoMerge pull request #7922 from badone/wip-14961-hammer
Sage Weil [Wed, 6 Apr 2016 14:43:16 +0000 (10:43 -0400)]
Merge pull request #7922 from badone/wip-14961-hammer

hammer: PK11_DestroyContext() is called twice if PK11_DigestFinal() fails

9 years agoMerge pull request #7992 from SUSE/wip-13807-hammer
Sage Weil [Wed, 6 Apr 2016 14:42:44 +0000 (10:42 -0400)]
Merge pull request #7992 from SUSE/wip-13807-hammer

hammer: segfault in Objecter::handle_watch_notify

9 years agoMerge pull request #8051 from xiaoxichen/wip-15024-hammer
Sage Weil [Wed, 6 Apr 2016 14:41:41 +0000 (10:41 -0400)]
Merge pull request #8051 from xiaoxichen/wip-15024-hammer

hammer: clock skew report is incorrect by ceph health detail command

9 years agoMerge pull request #8398 from asheplyakov/hammer-wip-15336
Sage Weil [Wed, 6 Apr 2016 14:40:51 +0000 (10:40 -0400)]
Merge pull request #8398 from asheplyakov/hammer-wip-15336

hammer: monclient: avoid key renew storm on clock skew

9 years agoMerge pull request #8272 from Yan-waller/yj-wip-fixbl
Loic Dachary [Wed, 6 Apr 2016 14:24:55 +0000 (16:24 +0200)]
Merge pull request #8272 from Yan-waller/yj-wip-fixbl

hammer: tests: bufferlist: do not expect !is_page_aligned() after unaligned rebuild

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7883 from tchaikov/wip-12848-hammer
Loic Dachary [Wed, 6 Apr 2016 14:20:15 +0000 (16:20 +0200)]
Merge pull request #7883 from tchaikov/wip-12848-hammer

hammer: osd: use GMT time for the object name of hitsets

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #7917 from ceph/wip-10794-hammer
Loic Dachary [Wed, 6 Apr 2016 14:18:11 +0000 (16:18 +0200)]
Merge pull request #7917 from ceph/wip-10794-hammer

hammer: ceph-objectstore-tool, osd: Fix import handling

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #8026 from liewegas/wip-reweight-hammer
Loic Dachary [Wed, 6 Apr 2016 14:13:32 +0000 (16:13 +0200)]
Merge pull request #8026 from liewegas/wip-reweight-hammer

hammer: mon: implement reweight-by-utilization feature

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #8049 from xiaoxichen/wip-15022-hammer
Loic Dachary [Wed, 6 Apr 2016 14:12:55 +0000 (16:12 +0200)]
Merge pull request #8049 from xiaoxichen/wip-15022-hammer

hammer: keyring permisions for mon deamon

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #8052 from xiaoxichen/wip-15051-hammer
Loic Dachary [Wed, 6 Apr 2016 14:09:42 +0000 (16:09 +0200)]
Merge pull request #8052 from xiaoxichen/wip-15051-hammer

hammer: test/librados/tier.cc doesn't completely clean up EC pools

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #8440 from dachary/wip-15382-hammer
Loic Dachary [Wed, 6 Apr 2016 14:03:07 +0000 (16:03 +0200)]
Merge pull request #8440 from dachary/wip-15382-hammer

hammer: rpm package building fails if the build machine has lttng and babeltrace development packages installed locally

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agotests: be more generous with test timeout 8470/head
Loic Dachary [Wed, 6 Apr 2016 13:39:23 +0000 (15:39 +0200)]
tests: be more generous with test timeout

When the thrasher is in action together with a validater (lockdep or
valgrind), a single test may hang for more than 360 seconds. Increase to
1200: it does not matter if the value is large, only that it prevents
the test from hanging forever.

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

9 years agoMerge pull request #8401 from Vicente-Cheng/wip-15129-hammer
Loic Dachary [Wed, 6 Apr 2016 13:05:11 +0000 (15:05 +0200)]
Merge pull request #8401 from Vicente-Cheng/wip-15129-hammer

hammer: Protect against excessively large object map sizes

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8011 from dillaman/wip-15033-hammer
Loic Dachary [Wed, 6 Apr 2016 11:44:09 +0000 (13:44 +0200)]
Merge pull request #8011 from dillaman/wip-15033-hammer

hammer: librbd: possible QEMU deadlock after creating image snapshots

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agorgw: user quota may not adjust on bucket removal 8113/head
Vicente Cheng [Tue, 9 Feb 2016 20:03:24 +0000 (12:03 -0800)]
rgw: user quota may not adjust on bucket removal

Description:
If the user/admin removes a bucket using --force/--purge-objects options with s3cmd/radosgw-admin respectively, the user stats will continue to reflect the deleted objects for quota purposes, and there seems to be no way to reset them. User stats need to be sync'ed prior to bucket removal.

Solution:
Sync user stats before removing a bucket.

Fixes: #14507
Signed-off-by: Edward Yang <eyang@us.fujitsu.com>
(cherry picked from commit 06507992e3fad837c4667f467d59fc026a2ca0e8)

Conflicts:

src/rgw/rgw_op.cc
            reordering the check seqence and replace some op_ret to ret

Backport Change:
We remove the `tenant` parameter because this feature is not introduced on hammer version.
The rgw multi-tenant feature is introduced on pr#6784 (https://github.com/ceph/ceph/pull/6784)
This feature is supported from v10.0.2 and later version.

9 years agoceph.spec.in: disable lttng and babeltrace explicitly 8440/head
Loic Dachary [Tue, 5 Apr 2016 09:53:54 +0000 (11:53 +0200)]
ceph.spec.in: disable lttng and babeltrace explicitly

before this change, we do not pacakge tracepoint probe shared libraries
on rhel7. but "configure" script enables them if lttng is detected. and
rpm complains at seeing installed but not pacakged files. as EPEL-7 now
includes lttng-ust-devel and libbabeltrace-devel, we'd better
BuildRequire them, and build with them unless disabled otherwise. so in
this change
* make "lttng" an rpm build option enabled by default
* BuildRequire lttng-ust-devel and libbabeltrace-devel if the "lttng"
 "lttng" option is enabled
* --without-lttng --without-babeltrace if the "lttng" option is disabled

Fixes: #14844
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit f1a44907a2f83cb8080cd8ab5980a30306a33fbd)

Conflicts:
ceph.spec.in: trivial resolution, the context changed
        (other packages, files etc.) but the semantic did not

9 years agocls_rbd: protect against excessively large object maps 8401/head
Jason Dillaman [Mon, 14 Mar 2016 17:57:28 +0000 (13:57 -0400)]
cls_rbd: protect against excessively large object maps

Fixes: #15121
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 4aff4ea3290dc7fb62c639bfc74fcfdde5fe9542)

  Conflicts:
src/cls/rbd/cls_rbd.cc
        `RBD_METADATA_KEY_PREFIX` is not introduced on hammer, so remove
        it

9 years agohammer: monclient: avoid key renew storm on clock skew 8398/head
Alexey Sheplyakov [Mon, 21 Mar 2016 15:20:18 +0000 (18:20 +0300)]
hammer: monclient: avoid key renew storm on clock skew

Refreshing rotating keys too often is a symptom of a clock skew, try to
detect it and don't cause extra problems:

* MonClient::_check_auth_rotating:
  - detect and report premature keys expiration due to a time skew
  - rate limit refreshing the keys to avoid excessive RAM and CPU usage
    (both by OSD in question and monitors which have to process a lot
    of auth messages)
* MonClient::wait_auth_rotating: wait for valid (not expired) keys
* OSD::init(): bail out after 10 attempts to obtain the rotating keys

Fixes: #15336
Signed-off-by: Alexey Sheplyakov <asheplyakov@mirantis.com>
(cherry picked from commit 918c12c2ab5d014d0623b1accf959b041aac5128)

Conflicts:
src/osd/OSD.cc
  no loadavg checks in Hammer, hence the conflict. Move the
  counter and max_attempts initialization to a suitable place.

9 years agoMerge pull request #8187 from liewegas/wip-15171
Loic Dachary [Thu, 31 Mar 2016 11:50:23 +0000 (13:50 +0200)]
Merge pull request #8187 from liewegas/wip-15171

hammer: osd/ReplicatedPG: do not proxy read *and* process op locally

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: David Disseldorp <ddiss@suse.de>
9 years agoosd/osd_types: encode pg_pool_t the old way 7883/head
Kefu Chai [Thu, 3 Mar 2016 04:03:44 +0000 (12:03 +0800)]
osd/osd_types: encode pg_pool_t the old way

as a workaround of #12410

Fixes: #12968
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agomon: disable gmt_hitset if not supported
Kefu Chai [Tue, 8 Sep 2015 08:52:32 +0000 (16:52 +0800)]
mon: disable gmt_hitset if not supported

the gmt_hitset is enabled by default in the ctor of pg_pool_t, this
is intentional. because we want to remove this setting and make
gmt_hitset=true as a default in future. but this forces us to
disable it explicitly when preparing a new pool if any OSD does
not support gmt hitset.

Fixes: #12968
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit e48cec3dc93b3988dcd8924933deb1b3a43e1d0f)

Conflicts:
src/mon/OSDMonitor.cc
remove unrelated hunk

9 years agoosd: do not let OSD_HITSET_GMT reuse the feature bit
Kefu Chai [Thu, 27 Aug 2015 16:32:38 +0000 (00:32 +0800)]
osd: do not let OSD_HITSET_GMT reuse the feature bit

* to ease the backport to hammer

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 5a4f6a866bb675195ad83c38fd23238d078c78ed)

Conflicts:
src/include/ceph_features.h
minor changes to resolve conflicts

9 years agoosd: Decode use_gmt_hitset with a unique version
David Zafman [Thu, 27 Aug 2015 18:24:25 +0000 (11:24 -0700)]
osd: Decode use_gmt_hitset with a unique version

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 2bc5a48f4c5d3667213be3a7b5a0e0f5ef9daf4f)

Conflicts:
src/osd/osd_types.cc
minor changes to resolve conflicts

9 years agomon: print use_gmt_hitset in "ceph osd pool get"
Kefu Chai [Tue, 18 Aug 2015 08:53:50 +0000 (16:53 +0800)]
mon: print use_gmt_hitset in "ceph osd pool get"

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit cc2bcf760f2d2f20fc4a2fa78ba52475a23e55bf)

Conflicts:
src/mon/OSDMonitor.cc
use the old way to dump pool info

9 years agomon: add "ceph osd pool set $pool use_gmt_hitset true" cmd
Kefu Chai [Mon, 17 Aug 2015 16:04:23 +0000 (00:04 +0800)]
mon: add "ceph osd pool set $pool use_gmt_hitset true" cmd

allow "ceph osd pool set $pool use_gmt_hitset <true|1>" as long as
the cluster supports gmt hitset.

Fixes: #9732
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 03a1a3cf023a9aeb2fa26820e49e5efe3f3b3789)

9 years agoosd: use GMT time for the object name of hitsets
Kefu Chai [Fri, 5 Jun 2015 13:06:48 +0000 (21:06 +0800)]
osd: use GMT time for the object name of hitsets

* bump the encoding version of pg_hit_set_info_t to 2, so we can
  tell if the corresponding hit_set is named using localtime or
  GMT
* bump the encoding version of pg_pool_t to 20, so we can know
  if a pool is using GMT to name the hit_set archive or not. and
  we can tell if current cluster allows OSDs not support GMT
  mode or not.
* add an option named `osd_pool_use_gmt_hitset`. if enabled,
  the cluster will try to use GMT mode when creating a new pool
  if all the the up OSDs support GMT mode. if any of the
  pools in the cluster is using GMT mode, then only OSDs
  supporting GMT mode are allowed to join the cluster.

Fixes: #9732
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 42f8c5daad16aa849a0b99871d50161673c0c370)

 Conflicts:
src/include/ceph_features.h
src/osd/ReplicatedPG.cc
src/osd/osd_types.cc
src/osd/osd_types.h
fill pg_pool_t with default settings in master branch.

9 years agotest/bufferlist: do not expect !is_page_aligned() after unaligned rebuild 8272/head
Kefu Chai [Thu, 3 Sep 2015 17:23:31 +0000 (01:23 +0800)]
test/bufferlist: do not expect !is_page_aligned() after unaligned rebuild

if the size of a bufferlist is page aligned we allocate page aligned
memory chunk for it when rebuild() is called. otherwise we just call
the plain new() to allocate new memory chunk for holding the continuous
buffer. but we should not expect that `new` allocator always returns
unaligned memory chunks. instead, it *could* return page aligned
memory chunk as long as the allocator feels appropriate. so, the
`EXPECT_FALSE(bl.is_page_aligned())` after the `rebuild()` call is
removed.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 8ed724222651812c2ee8cc3804dc1f54c973897d)

9 years agoosd/PG: fix generate_past_intervals 7917/head
Sage Weil [Tue, 6 Oct 2015 18:35:35 +0000 (14:35 -0400)]
osd/PG: fix generate_past_intervals

We may be only calculating older past intervals and have a valid
history.same_interval_since value, in which case the local
same_interval_since value will end at the newest old interval we had to
generate.

This was introduced by 70316541bbb115d9a35954bfba373cf1dc084b7e.

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

9 years agoMerge pull request #8123 from liewegas/wip-15136-hammer
Sage Weil [Fri, 18 Mar 2016 14:13:40 +0000 (10:13 -0400)]
Merge pull request #8123 from liewegas/wip-15136-hammer

qa/workunits: remove 'mds setmap' from workunits

9 years agoosd/ReplicatedPG: do not proxy read *and* process op locally 8187/head
Sage Weil [Thu, 17 Mar 2016 17:28:40 +0000 (13:28 -0400)]
osd/ReplicatedPG: do not proxy read *and* process op locally

If we proxy the read, we cannot return false, even if we fail to also
trigger a promotion.

Fixes: #15171
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd/OSDMap: fix typo in summarize_mapping_stats 8026/head
Sage Weil [Mon, 14 Mar 2016 12:07:19 +0000 (08:07 -0400)]
osd/OSDMap: fix typo in summarize_mapping_stats

From ea9abe53d0e777b7dc3b22af71639f77c4de08c8

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

9 years agoqa/workunits: remove 'mds setmap' from workunits 8123/head
Sage Weil [Tue, 15 Mar 2016 13:44:13 +0000 (09:44 -0400)]
qa/workunits: remove 'mds setmap' from workunits

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

9 years agomon: Monitor: get rid of weighted clock skew reports 8051/head
Joao Eduardo Luis [Thu, 7 Jan 2016 11:20:36 +0000 (11:20 +0000)]
mon: Monitor: get rid of weighted clock skew reports

By weighting the reports we were making it really hard to get rid of a
clock skew warning once the cause had been fixed.

Instead, as soon as we get a clean bill of health, let's run a new round
and soon as possible and ascertain whether that was a transient fix or
for realsies. That should be better than the alternative of waiting for
an hour or something (for a large enough skew) for the warning to go
away - and with it, the admin's sanity ("WHAT AM I DOING WRONG???").

Fixes: #14175
Signed-off-by: Joao Eduardo Luis <joao@suse.de>
(cherry pick from commit 17d8ff429c7dca8fc1ada6e7cc8a7c4924a22e28)

9 years agomon: Monitor: adaptative clock skew detection interval
Joao Eduardo Luis [Thu, 7 Jan 2016 11:05:44 +0000 (11:05 +0000)]
mon: Monitor: adaptative clock skew detection interval

When in the presence of a clock skew, adjust the checking interval
according to how many rounds have gone by since the last clean check.

If a skew is detected, instead of waiting an additional 300 seconds we
will perform the check more frequently, gradually backing off the
frequency if the skew is still in place (up to a maximum of
'mon_timecheck_interval', default: 300s). This will help with transient
skews.

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
(cherry pick from commit 45e16d0d7407cf4e886dde9321bb91c1a087776d)

Conflicts:
src/common/config_opts.h
            Merge the change line.
src/mon/Monitor.h
            handle_timecheck_leader(MonOpRequestRef op) was replaced with handle_timecheck_leader(MTimeCheck *m)
            also for handle_timecheck_peon and handle_timecheck.

9 years agotest/librados/test.cc: clean up EC pools' crush rules too 8052/head
Dan Mick [Thu, 26 Nov 2015 03:20:51 +0000 (19:20 -0800)]
test/librados/test.cc: clean up EC pools' crush rules too

SetUp was adding an erasure-coded pool, which automatically adds
a new crush rule named after the pool, but only removing the
pool.  Remove the crush rule as well.

http://tracker.ceph.com/issues/13878 Fixes: #13878

Signed-off-by: Dan Mick <dan.mick@redhat.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit 04b4795f81c15bfcb62ba5807745470ce0e5e949)

9 years agokeyring permissions for mon daemon 8049/head
Owen Synge [Wed, 2 Mar 2016 11:15:48 +0000 (12:15 +0100)]
keyring permissions for mon daemon

The command:

sudo ceph-mon --cluster ceph --mkfs -i $NODE_NAME --keyring $PATH_MON_KEYRING

Writes a new keyring with permissions set to "0644".

Fixes: #14950
Signed-off-by: Owen Synge osynge@suse.com
(cherry picked from commit c2f91a8ce46974a72b960b7cb25af3d089fbb80d)

9 years agoMerge pull request #7911 from dzafman/wip-meta-list-hammer
Loic Dachary [Fri, 11 Mar 2016 03:05:42 +0000 (10:05 +0700)]
Merge pull request #7911 from dzafman/wip-meta-list-hammer

hammer: tools, test: Add ceph-objectstore-tool to operate on the meta collection

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #7903 from branch-predictor/bp-hammer-force-bench-smoke
Loic Dachary [Fri, 11 Mar 2016 03:03:43 +0000 (10:03 +0700)]
Merge pull request #7903 from branch-predictor/bp-hammer-force-bench-smoke

hammer: tools/rados: add bench smoke tests

Reviewed-by: Loic Dachary <ldachary@redhat.com>