]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agotest: Fix grouping of mon_cephdf_commands by moving to MON_TESTS 9125/head
David Zafman [Wed, 18 May 2016 00:14:07 +0000 (17:14 -0700)]
test: Fix grouping of mon_cephdf_commands by moving to MON_TESTS

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

Conflicts:
qa/workunits/cephtool/test.sh (trivial)

9 years ago[MON] Fixed calculation of %USED. Now it is shows (space used by all replicas)/(raw...
Adam Kupczyk [Wed, 2 Mar 2016 11:31:01 +0000 (12:31 +0100)]
[MON] Fixed calculation of %USED. Now it is shows (space used by all replicas)/(raw space available on OSDs). Before it was (size of pool)/(raw space available on OSDs).

Signed-off-by: Adam Kupczyk akupczyk@mirantis.com
(cherry picked from commit 71c4e525f27b8efd2aa4f3b5e95f4a13f123d41a)

9 years agomon: add a column 'RAW USED' for ceph df detail
Ruifeng Yang [Tue, 12 Jan 2016 14:08:41 +0000 (22:08 +0800)]
mon: add a column 'RAW USED' for ceph df detail

Signed-off-by: Ruifeng Yang <yangruifeng.09209@h3c.com>
(cherry picked from commit 2b597ae6d4d53974f28a2da090232577daf09979)

Conflicts:
qa/workunits/cephtool/test.sh (trivial)
src/mon/PGMonitor.cc (trivial)
src/mon/PGMonitor.h (trivial)

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 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 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 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 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 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 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 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>
9 years agoMerge pull request #7876 from SUSE/wip-14946-hammer
Loic Dachary [Fri, 11 Mar 2016 03:02:18 +0000 (10:02 +0700)]
Merge pull request #7876 from SUSE/wip-14946-hammer

hammer: redhat-lsb-core dependency was dropped, but is still needed

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #7817 from asheplyakov/hammer-bug-14873
Loic Dachary [Fri, 11 Mar 2016 03:00:48 +0000 (10:00 +0700)]
Merge pull request #7817 from asheplyakov/hammer-bug-14873

hammer: tools: fix race condition in seq/rand bench (part 2)

Reviewed-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #7896 from asheplyakov/hammer-bug-14873-p1
Loic Dachary [Fri, 11 Mar 2016 03:00:18 +0000 (10:00 +0700)]
Merge pull request #7896 from asheplyakov/hammer-bug-14873-p1

hammer: tools: fix race condition in seq/rand bench (part 1)

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
9 years agotest/pybind/test_ceph_argparse: fix reweight-by-utilization tests
Sage Weil [Thu, 10 Mar 2016 13:50:57 +0000 (08:50 -0500)]
test/pybind/test_ceph_argparse: fix reweight-by-utilization tests

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

9 years agoman/8/ceph.rst: remove invalid option for reweight-by-*
Kefu Chai [Thu, 10 Mar 2016 13:41:15 +0000 (21:41 +0800)]
man/8/ceph.rst: remove invalid option for reweight-by-*

--yes-i-really-mean-it is not valid option for reweight-by-*

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

9 years agomon: remove range=100 from reweight-by-* commands
Sage Weil [Wed, 9 Mar 2016 18:25:55 +0000 (13:25 -0500)]
mon: remove range=100 from reweight-by-* commands

Specifying the range makes it skip instead of error when you give
it a bad value.

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

9 years agomon: make max_osds an optional arg
Sage Weil [Thu, 3 Mar 2016 18:46:12 +0000 (13:46 -0500)]
mon: make max_osds an optional arg

We keep the config option with the default (4), but let you
specify the max # of osds to reweight as a third optional arg.

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

9 years agomon: make reweight max_change default configurable
Sage Weil [Thu, 3 Mar 2016 18:38:57 +0000 (13:38 -0500)]
mon: make reweight max_change default configurable

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

9 years agomon/OSDMonitor: fix indentation
Sage Weil [Thu, 3 Mar 2016 18:38:19 +0000 (13:38 -0500)]
mon/OSDMonitor: fix indentation

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

9 years agoqa/workunits/cephtool/test.sh: test reweight-by-x commands
Sage Weil [Wed, 2 Mar 2016 22:34:48 +0000 (17:34 -0500)]
qa/workunits/cephtool/test.sh: test reweight-by-x commands

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

9 years agoosd/MonCommand: add/fix up 'osd [test-]reweight-by-{pg,utilization}'
Sage Weil [Thu, 10 Mar 2016 13:28:59 +0000 (08:28 -0500)]
osd/MonCommand: add/fix up 'osd [test-]reweight-by-{pg,utilization}'

- show before/after pg placement stats
- add test- variants that don't do anything
- only allow --no-increasing on the -utilization versions (where
  it won't conflict with the optional pool list and confuse the
  arg parsing)

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

- use non-C++11 sort

# Conflicts:
# src/mon/OSDMonitor.cc
# src/mon/OSDMonitor.h

9 years agomon: add 'osd utilization' command
Sage Weil [Wed, 2 Mar 2016 19:00:15 +0000 (14:00 -0500)]
mon: add 'osd utilization' command

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

9 years agoosd/OSDMap: add summarize_mapping_stats
Sage Weil [Thu, 10 Mar 2016 13:30:45 +0000 (08:30 -0500)]
osd/OSDMap: add summarize_mapping_stats

Calculate some basic stats about the PG distribution.

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

- remove c++11 auto and range-based for loops

9 years agomon: make reweight-by-* max_change an argument
Sage Weil [Thu, 3 Mar 2016 18:49:03 +0000 (13:49 -0500)]
mon: make reweight-by-* max_change an argument

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

9 years agoosd: add mon_reweight_max_osds to limit reweight-by-* commands
Dan van der Ster [Fri, 26 Feb 2016 21:29:46 +0000 (22:29 +0100)]
osd: add mon_reweight_max_osds to limit reweight-by-* commands

Add configurable mon_reweight_max_osds which limits the number
of OSDs modified each time reweight-by-* is called (by default
to 4 OSDs).

Also change the order in which we look at OSDs to go from most
to least utilized.

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
(cherry picked from commit 3aa0ccefddc1790df5b808bfccd5da4857951220)

9 years agoosd: add mon_reweight_max_change option which limits reweight-by-*
Dan van der Ster [Fri, 26 Feb 2016 21:28:46 +0000 (22:28 +0100)]
osd: add mon_reweight_max_change option which limits reweight-by-*

Add a configurable mon_reweight_max_change which limits be default
the reweight-by-* commands to only change an OSDs weight by 0.05.

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
(cherry picked from commit 6f0a1fb69da84ee18bdb9b151772cef8f32413c5)

9 years agotest: add simple test for new reweight-by-* options
Dan van der Ster [Fri, 26 Feb 2016 20:58:00 +0000 (21:58 +0100)]
test: add simple test for new reweight-by-* options

Test validity of --no-increasing and --yes-i-really-mean-it.

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
(cherry picked from commit 1a6ad5053e7fc4f8942855a17ce4540e340e9d4f)

9 years agoosd: add sure and no-increasing options to reweight-by-*
Dan van der Ster [Fri, 26 Feb 2016 20:52:41 +0000 (21:52 +0100)]
osd: add sure and no-increasing options to reweight-by-*

Add a --no-increasing option to reweight-by-* which can be used to only decrease
OSD weights without increasing any. This is useful for example if you need to
urgently lower the weight of nearly full OSDs.

Also add a --yes-i-really-mean-it confirmation to reweight-by-*.

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
(cherry picked from commit ddf5c2b62316bb69839f220fe2527d1467863421)

9 years agolibrbd: complete cache reads on cache's dedicate thread 8011/head
Jason Dillaman [Wed, 9 Mar 2016 23:00:04 +0000 (18:00 -0500)]
librbd: complete cache reads on cache's dedicate thread

If a snapshot is created out-of-band, the next IO will result in the
cache being flushed.  If pending writeback data performs a copy-on-write,
the read from the parent will be blocked.

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

9 years agotest: reproducer for writeback CoW deadlock
Jason Dillaman [Wed, 9 Mar 2016 22:31:06 +0000 (17:31 -0500)]
test: reproducer for writeback CoW deadlock

Refs: #14988

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

9 years agoosdc/Objecter: call notify completion only once 7992/head
Sage Weil [Mon, 16 Nov 2015 16:32:34 +0000 (11:32 -0500)]
osdc/Objecter: call notify completion only once

If we race with a reconnect we could get a second notify message
before the notify linger op is torn down.  Ensure we only ever
call the notify completion once to prevent a segfault.

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

9 years agoMerge pull request #6604 from ukernel/hammer-13268
Loic Dachary [Tue, 8 Mar 2016 03:00:15 +0000 (10:00 +0700)]
Merge pull request #6604 from ukernel/hammer-13268

hammer: client: added permission check based on getgrouplist

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #6551 from ceph/hammer-client-inoderef
Loic Dachary [Tue, 8 Mar 2016 02:58:30 +0000 (09:58 +0700)]
Merge pull request #6551 from ceph/hammer-client-inoderef

hammer: client inoderef

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agotests: Add TEST_no_segfault_for_bad_keyring to test/mon/misc.sh 7922/head
Brad Hubbard [Fri, 4 Mar 2016 03:06:47 +0000 (13:06 +1000)]
tests: Add TEST_no_segfault_for_bad_keyring to test/mon/misc.sh

94da46b6e31cac206cb32fc5bd3159209ee25e8c adds
TEST_no_segfault_for_bad_keyring which requires changes to run
in hammer since test/mon/misc.sh is not written to run multiple tests in
succession in the hammer version.

Refs: #14960

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
9 years agoMerge pull request #7797 from SUSE/wip-14861-hammer
Loic Dachary [Fri, 4 Mar 2016 03:25:00 +0000 (10:25 +0700)]
Merge pull request #7797 from SUSE/wip-14861-hammer

hammer: ceph init script unconditionally sources /lib/lsb/init-functions

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
9 years agotests: make sure no segfault occurs when using some bad keyring
Dunrong Huang [Mon, 7 Dec 2015 16:22:02 +0000 (00:22 +0800)]
tests: make sure no segfault occurs when using some bad keyring

Signed-off-by: Dunrong Huang <riegamaths@gmail.com>
(cherry picked from commit 2eb0bf32244fc174d56cc42e2298c67d8b5299ac)
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
9 years agoauth: fix a crash issue due to CryptoHandler::create() failed
Dunrong Huang [Wed, 25 Nov 2015 11:03:03 +0000 (19:03 +0800)]
auth: fix a crash issue due to CryptoHandler::create() failed

In this case(e.g. user passes wrong key), attempts to call the CryptoKey.ckh will lead to a segfault.

This patch fixes crash issue like following:

Program received signal SIGSEGV, Segmentation fault.
[Switching to Thread 0x7fffed10e700 (LWP 25051)]
0x00007ffff59896c6 in CryptoKey::encrypt (this=0x7fffed10d4f0, cct=0x555555829c30, in=..., out=..., error=0x7fffed10d440) at auth/cephx/../Crypto.h:110
110     return ckh->encrypt(in, out, error);
(gdb) bt
    at auth/cephx/../Crypto.h:110
    at auth/cephx/CephxProtocol.h:464

Signed-off-by: Dunrong Huang <riegamaths@gmail.com>
(cherry picked from commit a7f520caabf997b3753f1200f19f21830531b3f5)
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
9 years agoauth: fix double PK11_DestroyContext() if PK11_DigestFinal() failed
Dunrong Huang [Wed, 25 Nov 2015 10:24:30 +0000 (18:24 +0800)]
auth: fix double PK11_DestroyContext() if PK11_DigestFinal() failed

Signed-off-by: Dunrong Huang <riegamaths@gmail.com>
(cherry picked from commit e9e05333ac7c64758bf14d80f6179e001c0fdbfd)
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
9 years agoceph-objectstore-tool, osd: Fix import handling
David Zafman [Wed, 20 May 2015 21:09:02 +0000 (14:09 -0700)]
ceph-objectstore-tool, osd: Fix import handling

Use same_interval_since set to zero to communicate that an import has happened
and the correct value needs to be computed.

Fixes: #10794
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 70316541bbb115d9a35954bfba373cf1dc084b7e)

Conflicts:
src/osd/PG.cc (trivial)

9 years agotools, test: Add ceph-objectstore-tool to operate on the meta collection 7911/head
David Zafman [Thu, 4 Jun 2015 17:37:42 +0000 (10:37 -0700)]
tools, test: Add ceph-objectstore-tool to operate on the meta collection

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

Conflicts:
src/tools/ceph_objectstore_tool.cc
is_pg() still needs snap argument

9 years agocommon/obj_bencher.cc: make verify error fatal 7903/head
Piotr Dałek [Thu, 3 Mar 2016 10:30:53 +0000 (11:30 +0100)]
common/obj_bencher.cc: make verify error fatal

When run without "--no-verify", all verification errors are noted,
but they are not forwarded/reported anywhere else but to cerr, which
will cause automated testing to ignore them. Make seq_read_bench and
rand_read_bench return -EIO on any verification error which will,
in turn, return it back to caller.

Fixes: #14974
Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
(cherry picked from commit 658bba85c488a38e25bc598637258c263f711631)

9 years agotest/test_rados_tool.sh: force rados bench rand and seq
Piotr Dałek [Thu, 3 Mar 2016 13:40:44 +0000 (14:40 +0100)]
test/test_rados_tool.sh: force rados bench rand and seq

This forces rados bench rand and seq to execute, so if there's
a regression in any of above, it won't go unnoticed.

Fixes: #14974
Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
9 years agoMerge pull request #7672 from dachary/wip-14783-hammer
Sage Weil [Thu, 3 Mar 2016 13:35:37 +0000 (08:35 -0500)]
Merge pull request #7672 from dachary/wip-14783-hammer

hammer: test_bit_vector.cc uses magic numbers against #defines that vary

9 years agohammer: tools: fix race condition in seq/rand bench (part 2) 7817/head
Alexey Sheplyakov [Fri, 26 Feb 2016 12:01:11 +0000 (15:01 +0300)]
hammer: tools: fix race condition in seq/rand bench (part 2)

Commit c2c6d02591519dfd15ddcb397ac440322a964deb which is intended to
cherry-pick 9bcf5f065c4ed4b10d8f98961d1f99493bcdc9b8 incorrectly resolved
a conflict by adding code where it should have been removed. The incorrect
conflict resolution can been displayed with

   commit=c2c6d02591519dfd15ddcb397ac440322a964deb
   picked_from=9bcf5f065c4ed4b10d8f98961d1f99493bcdc9b8
   diff -u --ignore-matching-lines '^[^+-]' <(git show $picked_from) <(git show $commit)

--- /dev/fd/63    2016-03-03 14:09:51.354329129 +0700
+++ /dev/fd/62    2016-03-03 14:09:51.358329122 +0700
@@ -76,20 +79,18 @@
      ++data.in_flight;
 -    if (!no_verify) {
 -      snprintf(data.object_contents, data.object_size, "I'm the %16dth object!", current_index);
--      lock.Unlock();
+       lock.Unlock();
 -      if (memcmp(data.object_contents, cur_contents->c_str(), data.object_size) != 0) {
 -        cerr << name[slot] << " is not correct!" << std::endl;
 -        ++errors;
 -      }
--    } else {
--        lock.Unlock();
--    }
--
-+    lock.Unlock();
-     name[slot] = newName;
-   }
-
-@@ -789,11 +791,14 @@ int ObjBencher::rand_read_bench(int seconds_to_run, int num_objects, int concurr
++    if (memcmp(data.object_contents, cur_contents->c_str(), data.object_size) != 0) {
++      cerr << name[slot] << " is not correct!" << std::endl;
++      ++errors;
+     } else {
+       lock.Unlock();
+     }
+@@ -776,11 +785,14 @@ int ObjBencher::rand_read_bench(int seconds_to_run, int num_objects, int concurr
        }
        lc.cond.Wait(lock);
      }

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

Signed-off-by: Alexey Sheplyakov <asheplyakov@mirantis.com>
9 years agohammer: tools: fix race condition in seq/rand bench (part 1) 7896/head
Alexey Sheplyakov [Thu, 3 Mar 2016 12:30:23 +0000 (15:30 +0300)]
hammer: tools: fix race condition in seq/rand bench (part 1)

src/common/obj_bencher.cc:601: the lock should be taken before calling completion_ret,
not after. Also note that if r < 0 the lock will be unlocked twice in a row.
As a result rados bench seq fails with assertion in Mutex::Unlock().

Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
Signed-off-by: Alexey Sheplyakov <asheplyakov@mirantis.com>
(cherry picked from commit 0c8faf7c9982c564002771c3a41362a833ace9bb)

Conflicts:
src/common/obj_bencher.cc
src/common/obj_bencher.h
  Pick only the lock related part to unbreak seq bench. The failure due
  to the missing (or wrong sized) objects can be easily worked around, and
  the changes required to fix this problem are way too intrusive for hammer.

http://tracker.ceph.com/issues/14873 Related: #14873

9 years agoclient: use fuse_req_getgroups() to get group list 6604/head
Yan, Zheng [Tue, 29 Sep 2015 07:24:41 +0000 (15:24 +0800)]
client: use fuse_req_getgroups() to get group list

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit 0eb6d0ba1b65ac0aaffc72a82f07857cc65a6b88)

9 years agoclient: use thread local data to track fuse request
Yan, Zheng [Tue, 29 Sep 2015 07:11:24 +0000 (15:11 +0800)]
client: use thread local data to track fuse request

When handling an operation, libcephfs code may want to access fuse
request for extra information. by tracking fuse request in thread
local data, we can avoid adding extra parameter to Client::ll_foo
functions.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit a9f91d7d70893cdc5f832a26a5be298941d00315)

9 years agoclient/Client.cc: remove only once used variable
Danny Al-Gaaf [Tue, 18 Aug 2015 10:34:01 +0000 (12:34 +0200)]
client/Client.cc: remove only once used variable

Fix for:
[src/client/Client.cc:4555]: (style) The scope of the variable
 'initial_group_count' can be reduced.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit a29dd45dd89f59ff15018f541601ac5ede162174)

9 years agoclient/Client.cc: fix realloc memory leak
Danny Al-Gaaf [Wed, 12 Aug 2015 16:38:38 +0000 (18:38 +0200)]
client/Client.cc: fix realloc memory leak

Fix handling of realloc. If realloc() fails it returns NULL, assigning
the return value of realloc() directly to the pointer without checking
for the result will lead to a memory leak.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit 4f98dab99c35663de89a06e2dfdbd874f56aed41)

9 years agoclient: added permission check based on getgrouplist
blinke [Mon, 10 Aug 2015 15:43:10 +0000 (17:43 +0200)]
client: added permission check based on getgrouplist

Fixes: #13268
Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit f04c8da5432174874ca97d11a5b2fef56f95d73d)

9 years agoconfigure.ac: added autoconf check for getgrouplist
blinke [Mon, 10 Aug 2015 13:31:44 +0000 (15:31 +0200)]
configure.ac: added autoconf check for getgrouplist

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit 16b59c6cd68d532a47e8c0e7b1f088b41433f048)

9 years agoinit-ceph: check if /lib/lsb/init-functions exists 7797/head
Yan, Zheng [Thu, 23 Jul 2015 07:07:45 +0000 (15:07 +0800)]
init-ceph: check if /lib/lsb/init-functions exists

On OSX/FreeBSD, /lib/lsb/init-functions does not exist

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit bb1fa7f3993dfcd1243b2a9a0bb432c269df215f)

9 years agoMerge pull request #7671 from tchaikov/wip-14583-hammer
Loic Dachary [Thu, 3 Mar 2016 05:05:58 +0000 (12:05 +0700)]
Merge pull request #7671 from tchaikov/wip-14583-hammer

hammer: global/pidfile: do not start two daemons with a single pid-file

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #7702 from ceph/wip-14077-hammer
Loic Dachary [Thu, 3 Mar 2016 04:51:33 +0000 (11:51 +0700)]
Merge pull request #7702 from ceph/wip-14077-hammer

hammer: scrub bogus results when missing a clone

Reviewed-by: Martin Palma <martin@palma.bz>
Reviewed-by: Wei-Chung Cheng <freeze.vicente.cheng@gmail.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agopackaging: lsb_release build and runtime dependency 7876/head
Nathan Cutler [Fri, 26 Feb 2016 17:30:49 +0000 (18:30 +0100)]
packaging: lsb_release build and runtime dependency

The lsb_release executable is being run in multiple places, not least in
src/common/util.cc, which calls it via shell in the collect_sys_info() code
path.

This patch addresses this issue on SUSE- and Debian-derivatives, as well
as reinstating the dependency for RHEL/Fedora after it was dropped in
15600572265bed397fbd80bdd2b7d83a0e9bd918.

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

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

Conflicts:
ceph.spec.in
             The jewel specfile has diverged considerably from hammer:
             systemd, package split, etc. This is more of a hand backport
             than a cherry-pick.

9 years agoglobal: do not start two daemons with a single pid-file (part 2) 7671/head
Loic Dachary [Mon, 1 Feb 2016 12:32:13 +0000 (19:32 +0700)]
global: do not start two daemons with a single pid-file (part 2)

Fixes the following bugs:

* the fd is open(O_WRONLY) and cannot be read from, safe_read
  always fails and never removes the pid file.

* pidfile_open(g_conf) is close(STDOUT_FILENO) and there is a risk that
  pidfile_open gets STDOUT_FILENO only to have it closed and redirected
  to /dev/null.

* Before writing the file, ftruncate it so that overriding a file
  containing the pid 1234 with the pid 89 does not end up being
  a file with 8934.

* Before reading the file, lseek back to offset 0 otherwise it
  will read nothing.

* tests_pidfile was missing an argument when failing
  TEST_without_pidfile and killed all process with ceph in their name,
  leading to chaos and no useful error message.

* lstat(fd) cannot possibly return a result different from the one
  obtained right after the file was open, stat(path) must be used
  instead.

In addition to fixing the bugs above, refactor the pidfile.cc
implementation to:

* be systematic about error reporting (using cerr for when removing
  the pidfile because derr is not available at this point and derr
  when creating the pidfile).

* replace pidfile_open / pidfile_write with just pidfile_write since
  there never is a case when they are not used together.

More test cases are added to test_pidfile to verify the bugs above are
fixed.

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

Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit 9828d49d6f3ccfc78d496153d263ea39b1722d4b)

Conflicts:
src/global/global_init.cc
      - the `flag` argument of `global_init_prefork()` is not used, so
        it was removed in master. but the cleanup commit was not
        cherry-picked to hammer, thus the conflict. we can just keep it
        around in hammer to minimize the code churn, although it may
        stand in the way of future backports.)
      - s/nullptr/NULL/ as hammer does not support c++11.

9 years agoMerge backport pull request #6545 into wip-14077-hammer 7702/head
David Zafman [Thu, 25 Feb 2016 22:25:48 +0000 (14:25 -0800)]
Merge backport pull request #6545 into wip-14077-hammer

A commit skipped because remove_coll() still needed in Hammer

9 years agoMerge backport pull request #5783 into wip-14077-hammer
David Zafman [Thu, 25 Feb 2016 22:25:35 +0000 (14:25 -0800)]
Merge backport pull request #5783 into wip-14077-hammer

9 years agoMerge backport pull request #5031 into wip-14077-hammer
David Zafman [Thu, 25 Feb 2016 22:25:17 +0000 (14:25 -0800)]
Merge backport pull request #5031 into wip-14077-hammer

9 years agoMerge backport pull request #5842 into wip-14077-hammer
David Zafman [Thu, 25 Feb 2016 22:24:58 +0000 (14:24 -0800)]
Merge backport pull request #5842 into wip-14077-hammer

9 years agoMerge backport pull request #5127 into wip-14077-hammer
David Zafman [Thu, 25 Feb 2016 22:24:31 +0000 (14:24 -0800)]
Merge backport pull request #5127 into wip-14077-hammer

9 years agoMerge backport 6 commits from pull request #5197 into wip-14077-hammer
David Zafman [Thu, 25 Feb 2016 22:23:14 +0000 (14:23 -0800)]
Merge backport 6 commits from pull request #5197 into wip-14077-hammer

Excludes the ceph-objectstore-tool meta-list op

9 years agoMerge backport branch 'wip-temp' into wip-14077-hammer
David Zafman [Thu, 25 Feb 2016 22:22:26 +0000 (14:22 -0800)]
Merge backport branch 'wip-temp' into wip-14077-hammer

9 years agoMerge backport pull request #4932 into wip-14077-hammer
David Zafman [Thu, 25 Feb 2016 22:21:20 +0000 (14:21 -0800)]
Merge backport pull request #4932 into wip-14077-hammer