Commit Graph

35254 Commits

Author SHA1 Message Date
John Spray
d7fc9a73bc Merge pull request #2316 from dachary/wip-warning
rbd: fix signess warning

Reviewed-by: John Spray <john.spray@redhat.com>
2014-08-25 11:06:42 +01:00
Loic Dachary
74ce4f267e rbd: fix signess warning
Signed-off-by: Loic Dachary <loic-201408@dachary.org>
2014-08-25 01:40:46 +02:00
Loic Dachary
d848a40040 Merge pull request #2138 from xiaoxichen/fix_crush_ruleset
mon/OSDMonitor : Use user provided ruleset for replicated pool

Reviewed-by: Loic Dachary <loic-201408@dachary.org>
2014-08-25 00:50:23 +02:00
Sage Weil
8d406001d9 Merge branch 'wip-weak-refs' 2014-08-22 11:10:18 -07:00
Sage Weil
06682c4b2d vstart.sh: debug rgw = 20 on -d
Signed-off-by: Sage Weil <sage@redhat.com>
2014-08-22 11:08:34 -07:00
Sage Weil
8a212170e7 Merge pull request #2292 from lpabon/rgw-doc
vstart.sh to enable support for simple Rados

Tested-by: GWabhishek.lekshmanan@gmail.com
2014-08-22 11:08:08 -07:00
Sage Weil
f246b56926 common/shared_cache: dump weak refs on shutdown
Before asserting, dump what the refs are along with the counts.

Signed-off-by: Sage Weil <sage@redhat.com>
2014-08-22 09:17:06 -07:00
Sage Weil
6f15a4ca18 Merge pull request #2304 from majianpeng/fix1
small bug fix for journal

Reviewed-by: Sage Weil <sage@redhat.com>
2014-08-22 09:13:21 -07:00
Sage Weil
6cf583c4b7 common/shared_cache: take a cct
Signed-off-by: Sage Weil <sage@redhat.com>
2014-08-22 09:04:37 -07:00
Sage Weil
997f766aa8 Merge pull request #2291 from ceph/wip-fingerprint
mon: add a unique clsuter fingerprint

Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
2014-08-22 08:46:54 -07:00
Loic Dachary
d6aa78334b Merge pull request #2307 from dmsimard/crushdoc
Doc: Add config option to turn off crush update

Reviewed-by: Loic Dachary <loic-201408@dachary.org>
2014-08-22 17:17:17 +02:00
Loic Dachary
2ba081d40f Merge pull request #2288 from xiaoxichen/fix_add_simple_ruleset
CrushWrapper: pick a ruleset same as rule_id

Reviewed-by: Loic Dachary <loic-201408@dachary.org>
2014-08-22 17:00:54 +02:00
David Moreau Simard
2c2748519d Doc: Add config option to turn off crush update
Signed-off-by: David Moreau Simard <dmsimard@iweb.com>
2014-08-22 10:55:55 -04:00
Xiaoxi Chen
78e84f34da CrushWrapper: pick a ruleset same as rule_id
Originally in the add_simple_ruleset funtion, the ruleset_id
is not reused but rule_id is reused. So after some add/remove
against rules, the newly created rule likely to have
ruleset!=rule_id.

We dont want this happen because we are trying to hold the constraint
that ruleset == rule_id.

Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
2014-08-22 21:22:56 +08:00
Loic Dachary
5234abfa22 Merge pull request #2273 from dachary/wip-mailmap
mailmap updates
2014-08-22 03:05:48 +02:00
Sage Weil
5f1e1e0e34 Merge remote-tracking branch 'gh/wip-filejournal'
Reviewed-by: Sage Weil <sage@redhat.com>
Tested-by: Mark Kirkwood <mark.kirkwood@catalyst.net.nz>
2014-08-21 17:48:41 -07:00
Sage Weil
82ac61fc40 Merge remote-tracking branch 'gh/wip-lttng' 2014-08-21 15:06:11 -07:00
Sage Weil
01ce249718 Revert "Merge pull request #2253 from adamcrume/wip-lttng"
This reverts commit 5b9ade5058, reversing
changes made to b0aa846b3f.

I merged the wrong version of wip-lttng.

Signed-off-by: Sage Weil <sage@redhat.com>
2014-08-21 15:05:40 -07:00
David Zafman
7e4b525e80 Merge pull request #2274 from ceph/wip-9144
filestore: fix force_sync race with mount + umount + mount

Reviewed-by: David Zafman <dzafman@redhat.com>
2014-08-21 13:43:50 -07:00
Sage Weil
5b9ade5058 Merge pull request #2253 from adamcrume/wip-lttng
RBD-replay

Reviewed-by: Sage Weil <sage@redhat.com>
2014-08-21 13:14:51 -07:00
Sage Weil
b245d60016 mon: generate cluster_fingerprint if null
This triggers after an upgrade of a legacy cluster that has no fingerprint.

Signed-off-by: Sage Weil <sage@redhat.com>
2014-08-21 11:14:46 -07:00
Sage Weil
675b0042ef mon: add a cluster fingerprint
Generate it on cluster creations with the initial monmap.  Include it in
the report.  Provide no way for this uuid to be fed in to the cluster
(intentionally or not) so that it can be assumed to be a truly unique
identifier for the cluster.

Signed-off-by: Sage Weil <sage@redhat.com>
2014-08-21 11:14:46 -07:00
Adam Crume
552c4b4479 rbd_replay: Add unit test for batch_unreachable_from
This requires a fair amount of code reorganization, since the types in
the function signature were previously not in a header file.

Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:35 -07:00
Adam Crume
76160925a6 rbd-replay: Add unit test for Ser
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:35 -07:00
Adam Crume
9673e2f3c1 lttng: Split --with-lttng and --with-babeltrace options
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:35 -07:00
Adam Crume
07ab36f9e7 lttng: Remove tracing-specfic local variables when lttng disabled
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:35 -07:00
Adam Crume
3f1917c094 lttng: Add informational messages to configure.ac
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:34 -07:00
Adam Crume
230c5b8e7f lttng: Only install rbd-replay-prep when enabled
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:34 -07:00
Adam Crume
141f37a611 lttng: Check for babeltrace when autoconfiguring lttng
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:34 -07:00
Adam Crume
9c388f08f7 lttng: Check that the main babeltrace header is present
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:34 -07:00
Adam Crume
84bfe910a7 lttng: Test for sane lttng-gen-tp
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:34 -07:00
Adam Crume
e419ba60f5 lttng: Don't build trace libraries when lttng is disabled
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:34 -07:00
Adam Crume
d1064bffcf lttng: Fix build error on 32-bit systems
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:34 -07:00
Adam Crume
42d633f317 lttng: Remove -lboost_regex from unit test
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:34 -07:00
Adam Crume
a35b5d2c1b lttng: Don't build trace headers when lttng is disabled
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:34 -07:00
Adam Crume
861e6a3920 lttng: Update packaging
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:34 -07:00
Adam Crume
7ff6ed11b5 lttng: Only require lttng for Fedora >= 20 and RHEL == 6 for RPM distros
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:34 -07:00
Adam Crume
fed22f496e lttng: Add distro packaging
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:33 -07:00
Adam Crume
edddb3fae6 lttng: Fix "make distcheck"
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:33 -07:00
Adam Crume
d4186feec5 lttng: Support --with-lttng=check
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:33 -07:00
Adam Crume
8d71b6c183 lttng: Remove tracing from libcommon
This is a short-term fix for issues caused by tracepoints in libcommon.
Code crashes at runtime if the same tracepoints are linked into the
program multiple times.  This happens with libcommon because it is
statically linked into dynamic libraries such as librados, then
statically linked into executables because symbols from libcommon are
not exposed in librados.  Therefore, any programs that use librados and
libcommon would crash because of duplicate tracepoints.

Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:33 -07:00
Adam Crume
660f1d68e4 rbd-replay: Fix bug in rbd-replay-prep, Thread::issued_io with wrong IO
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:33 -07:00
Adam Crume
18c081e54a rbd-replay: Remove extent tracepoints and inline extents
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:33 -07:00
Adam Crume
e555867eef rbd-replay: Move tracepoints from internal.cc to librbd.cc
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:33 -07:00
Adam Crume
0cd2651cad rbd-replay: Add man page and package binaries for rbd-replay-prep
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:33 -07:00
Adam Crume
0f052f8cef rbd-replay: Convert prep-for-replay.py to rbd-replay-prep.cc
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:33 -07:00
Adam Crume
e18748ed99 rbd-replay: Add man page, and add binaries to Debian packaging
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:33 -07:00
Adam Crume
f5272d578e rbd-replay: Remove outdated message that says regexes are used
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:32 -07:00
Adam Crume
63273a282e lttng: Replace Boost dependencies with custom string code
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:32 -07:00
Adam Crume
8b9f887887 rbd-replay: Remove boost_regex from LIBADD and LDADD
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:32 -07:00