]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agoDon't fool with version placeholder
Thorsten Behrens [Mon, 16 Feb 2015 15:11:29 +0000 (16:11 +0100)]
Don't fool with version placeholder

(cherry picked from commit b846ca37729b4c113dc36ebac5505776f1481acb)
(cherry picked from commit 0483453f178144f094d0d18d7605f70375b420e0)

10 years agoAnd some more local changes for SUSE packaging
Thorsten Behrens [Mon, 16 Feb 2015 13:56:44 +0000 (14:56 +0100)]
And some more local changes for SUSE packaging

(cherry picked from commit 40a8d12af4ad8990279c29027ed9b8ab917836c6)

Conflicts:
ceph.spec.in

(cherry picked from commit 4be5a1c7644ab7bc695cc6bfa1beefc3ebbf76e2)

Conflicts:
ceph.spec.in

10 years agoSupport ceph cluster names with systemd
Owen Synge [Wed, 11 Feb 2015 17:18:05 +0000 (18:18 +0100)]
Support ceph cluster names with systemd

Systemd unit files could only ever support one cluster name due
to not supporting dynamically gathered variables. For this reason
we support multiple systemd units for different cluster names.

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit 28fb607cadb8cfa438ecd9d53accafef8a73089b)
(cherry picked from commit 8e011aa19384bcfe12c5aee9949019bb739110cc)

10 years agoAlways provide summary for non-healthy cluster.
Thorsten Behrens [Fri, 6 Feb 2015 00:26:40 +0000 (01:26 +0100)]
Always provide summary for non-healthy cluster.

This fixes bnc#902744, wherein calamari does not provide
popup drill-downs for warnings or errors, should the summary
be missing.

Downstream bug link:
 https://bugzilla.novell.com/show_bug.cgi?id=902744

Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
(cherry picked from commit 796d1a6e49232117c45f26f30468f3b201a0ce49)
(cherry picked from commit 190e7af51e91d08a0ac45bda881bfcb5ac020523)

10 years agoUse sysV init script directly
Owen Synge [Tue, 3 Feb 2015 16:58:09 +0000 (17:58 +0100)]
Use sysV init script directly

ceph-disk:SLE11sp3 /sbin/service cannot take paramteres that start with '--'
so use the init script directly.

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit fff38a0f18d1986f63a31e26d2b84749adab88af)
(cherry picked from commit 11fa95c34e26ee9462498ec68d24e95001744b08)

10 years agoNew rich init system detection.
Owen Synge [Mon, 26 Jan 2015 15:20:20 +0000 (16:20 +0100)]
New rich init system detection.

Uses both a database and detecting management commands to find init system.
Logs error is one of these two systems fails.
Raises error if both systems disgree.

Testing notes:
- works on SLE12
- works on openSUSE 13.1
- works on Scientific 6.4
- works on debian 7.7 (wheezy)
- works on debian 8 (jessie)

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit a818d4327b29056cfdb4ad54872a65eb277efe7b)
(cherry picked from commit b709f6aa17bbb37da127c6d38612787c638b8c86)

10 years agoChanged prestart script path
Owen Synge [Fri, 23 Jan 2015 11:04:37 +0000 (12:04 +0100)]
Changed prestart script path

Ceph was teh only application I could find in suse which used the path
/usr/libexec so I changed this to the /usr/lib/ patch for
/usr/lib/ceph/ceph-osd-prestart.sh

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit aecc4878c8127731af0a236c0c6e3e78fd388464)
(cherry picked from commit d923c21019ddd516f3ea4ed6055a75678f0dae5d)

10 years agoFixes to rcceph script
Owen Synge [Mon, 12 Jan 2015 13:35:41 +0000 (14:35 +0100)]
Fixes to rcceph script

 - only start OSDs if mon daemons are also present
 - adds support for mask and unmask
 - removes support for cluster with non default cluster name,
   as this was very limited and inconsistent

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit 66cb46c411d874be009c225450eea5021cf1219b)
(cherry picked from commit 5f6ee9afc3a8bd6c674a4cf0c94827bcf929dc11)

10 years agoradosgw systemd support
Owen Synge [Wed, 7 Jan 2015 10:36:24 +0000 (11:36 +0100)]
radosgw systemd support

Added a radosgw systemd support and associated prestart script.
  - With improved checking over first revison.
  - ceph-radosgw-prestart.sh now installed in /usr/lib/ceph-radosgw

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit cd3cb8bb009a55a6eb6fe3c650b4611a33fab374)
(cherry picked from commit d5fc5e690a24fd92111df28d6934c4c56d6d87ed)

10 years agoceph-osd-prestart.sh: check OSD exists.
Owen Synge [Tue, 6 Jan 2015 12:16:22 +0000 (13:16 +0100)]
ceph-osd-prestart.sh: check OSD exists.

if the directory ${dir_osd-/var/lib/ceph/osd/}/${cluster:-ceph}-${id}
does not exist fail with a clear error message.

https://bugzilla.suse.com/show_bug.cgi?id=895759 fixes # 895759

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit 460ef1c25014060c14b9217224355ef3e1ca7284)
(cherry picked from commit 8c8b9a0a6ca1b3600184f5072488e22be5865a96)

10 years agoFix overflowing journel partitions.
Owen Synge [Wed, 3 Dec 2014 11:32:34 +0000 (12:32 +0100)]
Fix overflowing journel partitions.

This fixes bnc#896406. When useing ceph-disk to create a journel
parititon in the next available partition and thier is not enough
space ceph-disk did not provide a clear error message.

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit 5690eb1c4d40ea3fd2e84894fa24400289357802)
(cherry picked from commit 43543454a4ab72f4c459230a98081d64dba9b294)

10 years agoFor the moment, hardcode SUSE-isms in spec file
Thorsten Behrens [Fri, 12 Sep 2014 23:20:09 +0000 (01:20 +0200)]
For the moment, hardcode SUSE-isms in spec file

Conflicts:
ceph.spec.in

(cherry picked from commit fe24ef77038e56fe685f2769e20d7d3f8d325df7)

Conflicts:
ceph.spec.in

(cherry picked from commit 21b5a67575b9b8c3f7a5e8d2171f537b3925330a)

10 years agoudev rules now explicitly specify init system
Owen Synge [Fri, 12 Sep 2014 14:04:03 +0000 (16:04 +0200)]
udev rules now explicitly specify init system

ceph-disk detects OS and Version and from this decides
to use sysV systemd or upstart. This code needs a bigger
rewrite so for now just explicitly tell ceph-disk the
init system.

Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
(cherry picked from commit 283a37cf2344e52a76d08ae3b075dc99fe18f175)
(cherry picked from commit 9269b678a9cde103850b60ca8bb77f37f4d6bc53)

10 years agoFix bnc#890345 - wrong service name for logrotate.
Thorsten Behrens [Tue, 5 Aug 2014 08:01:42 +0000 (10:01 +0200)]
Fix bnc#890345 - wrong service name for logrotate.

We've renamed the service to ceph-radosgw, reflect that in
logrotate config, too.

Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
(cherry picked from commit 01c9bca6c4dd1a43fa994d8caa37fa3a4d34872b)
(cherry picked from commit d1aaaefd7d4cdcaaec0f8a316bd59f71936662a5)

10 years agoFix "disk zap" sgdisk invocation
Owen Synge [Thu, 7 Aug 2014 09:23:09 +0000 (11:23 +0200)]
Fix "disk zap" sgdisk invocation

If the metadata on the disk is truly invalid, sgdisk would fail to zero
it in one go, because --mbrtogpt apparently tried to operate on the
metadata it read before executing --zap-all.

Splitting this up into two separate invocations to first zap everything
and then clear it properly fixes this issue.

Based on patch by Lars Marowsky-Bree <lmb@suse.com> in ceph-deploy.
Created by Vincent Untz <vuntz@suse.com>

Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
(cherry picked from commit 328cd17546187fb3e17766a1148012c43e25e205)
(cherry picked from commit d54a8b1f5b8ffbd948503cfbf27e7c3f55b5c542)

10 years agoConvert remaining init script actions over to suse.
Thorsten Behrens [Wed, 30 Jul 2014 22:17:11 +0000 (00:17 +0200)]
Convert remaining init script actions over to suse.

Fix for bnc#887880 - both restart and stop now employ
killproc instead of the debian-ish start-stop-daemon.

Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
(cherry picked from commit 9de65177c0d2573c8449f7ea1a040fd397c4dc24)
(cherry picked from commit 8c161c1fed3ce274472faf4ded74d8479e05a9eb)

10 years ago0.94.1 v0.94.1
Jenkins [Fri, 10 Apr 2015 19:04:50 +0000 (12:04 -0700)]
0.94.1

10 years agoMerge pull request #4328 from dachary/wip-11364-hammer
Loic Dachary [Fri, 10 Apr 2015 15:51:38 +0000 (17:51 +0200)]
Merge pull request #4328 from dachary/wip-11364-hammer

v4 bucket feature detection

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agocrush: fix has_v4_buckets() 4328/head
Sage Weil [Fri, 10 Apr 2015 15:43:45 +0000 (08:43 -0700)]
crush: fix has_v4_buckets()

alg, not type!

This bug made us incorrectly think we were using v4 features when user type
5 was being used.  That's currently 'rack' with recent crush maps, but
was other types for clusters that were created with older versions.  This
is clearly problematic as it will lock out non-hammer clients incorrectly,
breaking deployments on upgrade.

Fixes: #11364
Backport: hammer
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 38b35ab9d17eb84ac178c4cd3ebcf2ec0f66d8b6)

10 years agocrush: fix dump of has_v4_buckets
Sage Weil [Fri, 10 Apr 2015 00:17:59 +0000 (17:17 -0700)]
crush: fix dump of has_v4_buckets

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

10 years agocrush/mapper: fix divide-by-0 in straw2
Sage Weil [Thu, 9 Apr 2015 21:42:34 +0000 (14:42 -0700)]
crush/mapper: fix divide-by-0 in straw2

If the item weight is 0 we don't want to divide; instead draw a minimal
value.

Fixes: #11357
Reported-by: Yann Dupont <yd@objoo.org>
Tested-by: Yann Dupont <yd@objoo.org>
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 64d1e900ec4f5831972ec80e8d0129604669f5bb)

10 years agoosd: fix negative degraded objects during backfilling
Guang Yang [Thu, 26 Feb 2015 08:13:12 +0000 (08:13 +0000)]
osd: fix negative degraded objects during backfilling

When there is deleting requests during backfilling, the reported number of degraded
objects could be negative, as the primary's num_objects is the latest (locally) but
the number for replicas might not reflect the deletings. A simple fix is to ignore
the negative subtracted value.

Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
(cherry picked from commit 14d7e36d3c978844da73d0e1c8a3a1ec863bac15)

10 years ago0.94 v0.94
Jenkins [Tue, 7 Apr 2015 17:05:41 +0000 (10:05 -0700)]
0.94

10 years agodebian: remove lttng checking from rules
Josh Durgin [Mon, 6 Apr 2015 18:08:33 +0000 (11:08 -0700)]
debian: remove lttng checking from rules

This can be done better in a separate script, which puts these in
CEPH_EXTRA_CONFIGURE_ARGS. In particular, this lets us enable
lttng for gitbuilder builds, but not release builds.

Fixes: #11333
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit a294daff0bb69a7e0951f98c9497ccb22e91e705)

10 years agoMerge pull request #4246 from ceph/wip-11113-hammer
Sage Weil [Mon, 6 Apr 2015 15:55:51 +0000 (08:55 -0700)]
Merge pull request #4246 from ceph/wip-11113-hammer

librbd: snap_remove should ignore -ENOENT errors

10 years agoMerge pull request #4250 from athanatos/wip-11265
Sage Weil [Mon, 6 Apr 2015 15:07:28 +0000 (08:07 -0700)]
Merge pull request #4250 from athanatos/wip-11265

ECTransaction: write out the hinfo key on touch as well

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4251 from athanatos/wip-11284
Sage Weil [Mon, 6 Apr 2015 15:07:15 +0000 (08:07 -0700)]
Merge pull request #4251 from athanatos/wip-11284

ReplicatedPG::promote_object: do not create obc if not promoting

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4167 from dzafman/wip-11184
Samuel Just [Thu, 2 Apr 2015 04:03:37 +0000 (21:03 -0700)]
Merge pull request #4167 from dzafman/wip-11184

Fix 11184 by filtering the log

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agolibrbd: snap_remove should ignore -ENOENT errors 4246/head
Jason Dillaman [Mon, 16 Mar 2015 22:40:49 +0000 (18:40 -0400)]
librbd: snap_remove should ignore -ENOENT errors

If the attempt to deregister the snapshot from the parent
image fails with -ENOENT, ignore the error as it is safe
to assume that the child is not associated with the parent.

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

10 years agolibrbd: get_parent_info should protect against invalid parent
Jason Dillaman [Mon, 16 Mar 2015 22:35:07 +0000 (18:35 -0400)]
librbd: get_parent_info should protect against invalid parent

get_parent_info should return -ENOENT if the image does not
have an associated parent image.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 21afd0ef8e1fb81c5ace5fd403513c542e2413e3)

10 years agoMerge pull request #4230 from athanatos/wip-11244
Samuel Just [Tue, 31 Mar 2015 16:47:10 +0000 (09:47 -0700)]
Merge pull request #4230 from athanatos/wip-11244

ReplicatedPG::cancel_pull: requeue waiters as well

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4219 from liewegas/wip-scrub-mtime
Samuel Just [Tue, 31 Mar 2015 16:45:46 +0000 (09:45 -0700)]
Merge pull request #4219 from liewegas/wip-scrub-mtime

osd: do not update mtime when recording digest

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #4229 from athanatos/wip-scrub-hitsets
Sage Weil [Tue, 31 Mar 2015 16:39:32 +0000 (09:39 -0700)]
Merge pull request #4229 from athanatos/wip-scrub-hitsets

ReplicatedPG: don't write hitset while scrubbing, update scrub_cstat

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4228 from athanatos/wip-11280
Sage Weil [Tue, 31 Mar 2015 16:38:48 +0000 (09:38 -0700)]
Merge pull request #4228 from athanatos/wip-11280

Wip 11280

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4207 from ceph/wip-11177
Samuel Just [Tue, 31 Mar 2015 16:26:56 +0000 (09:26 -0700)]
Merge pull request #4207 from ceph/wip-11177

common: fix logging default channel to be 'cluster' not 'default' (11177)

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoReplicatedPG::cancel_pull: requeue waiters as well 4230/head
Samuel Just [Thu, 26 Mar 2015 17:26:48 +0000 (10:26 -0700)]
ReplicatedPG::cancel_pull: requeue waiters as well

If we are in recovery_wait, we might not recover that object as part of
recover_primary for some time.  Worse, if we are waiting on a backfill
which is blocked waiting on a copy_from on the missing object in
question, it can become a dead lock.

Fixes: 11244
Backport: firefly
Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoReplicatedPG: don't write hitset while scrubbing, update scrub_cstat 4229/head
Samuel Just [Sun, 29 Mar 2015 22:30:52 +0000 (15:30 -0700)]
ReplicatedPG: don't write hitset while scrubbing, update scrub_cstat

Fixes: 11263
Fixes: 11262
Backport: firefly
Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoReplicatedPG: in do_op, requeue op if we requeue waiters in agent_choose_mode 4228/head
Samuel Just [Mon, 30 Mar 2015 21:04:29 +0000 (14:04 -0700)]
ReplicatedPG: in do_op, requeue op if we requeue waiters in agent_choose_mode

The current op might be ordered after a waiter.

Fixes: 11280
Backport: firefly
Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoReplicatedPG: requeue waiting_for_active before waiting_for_cache_not_full
Samuel Just [Mon, 30 Mar 2015 20:22:26 +0000 (13:22 -0700)]
ReplicatedPG: requeue waiting_for_active before waiting_for_cache_not_full

The waiting_for_cache_not_full waiters must be dequeued first.

Fixes: 11267
Backport: firefly
Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoReplicatedPG::promote_object: do not create obc if not promoting 4251/head
Samuel Just [Tue, 31 Mar 2015 15:41:09 +0000 (08:41 -0700)]
ReplicatedPG::promote_object: do not create obc if not promoting

Otherwise, we can leave an incorrect cached obc around.

Introduced: 65bb4df599541cd2e0f195b905f24f529e255c00
Fixes: 11284
Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoECTransaction: write out the hinfo key on touch as well 4250/head
Samuel Just [Sun, 29 Mar 2015 22:46:59 +0000 (15:46 -0700)]
ECTransaction: write out the hinfo key on touch as well

This way, even empty objects have the hinfo key written.  That way,
touch and touch->append->truncate end up with the same state.

Fixes: 11265
Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoosd: drop unused utime_t now arg to issue_repop 4219/head
Sage Weil [Mon, 30 Mar 2015 14:13:43 +0000 (07:13 -0700)]
osd: drop unused utime_t now arg to issue_repop

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: do not update mtime when recording digest
Jianpeng Ma [Mon, 30 Mar 2015 14:17:40 +0000 (07:17 -0700)]
osd: do not update mtime when recording digest

The user mtime and local_mtime are normally set in finish_ctx based on the
value of ctx->mtime; clear that to avoid this update.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
[Sage: simplified]
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4131 from t-miyamae/wip-mshec-documentation-h2
Loic Dachary [Mon, 30 Mar 2015 12:37:08 +0000 (14:37 +0200)]
Merge pull request #4131 from t-miyamae/wip-mshec-documentation-h2

erasure code: add shec's documentation / change default layout

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agotest: Add testing for PGLog::filter_log() 4167/head
David Zafman [Fri, 27 Mar 2015 05:32:25 +0000 (22:32 -0700)]
test: Add testing for PGLog::filter_log()

Indirectly tests pg_log_t::filter_log()

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoosd: Create a filter_log for PGLog
David Zafman [Thu, 26 Mar 2015 22:49:16 +0000 (15:49 -0700)]
osd: Create a filter_log for PGLog

This could be tested as a way to test pg_log_t::filter_log()

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoceph-objectstore-tool, osd: Filter the pg_log_t for objects no longer in pg
David Zafman [Thu, 26 Mar 2015 22:53:42 +0000 (15:53 -0700)]
ceph-objectstore-tool, osd: Filter the pg_log_t for objects no longer in pg

Fixes: #11184
Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agocommon: send cluster log messages to 'cluster' channel by default 4207/head
Sage Weil [Fri, 27 Mar 2015 22:35:21 +0000 (15:35 -0700)]
common: send cluster log messages to 'cluster' channel by default

The CLOG_CHANNEL_DEFAULT constant was being abused for two purposes:

 - the default channel to log messages to
 - the name of the config option key in the key/value pair string that is
   used for the default option, e.g. "default=true foo=false bar=false"

Fix this by making the config option key CLOG_CONFIG_DEFAULT_KEY and
replacing throughout, and changing CLOG_CHANNEL_DEFAULT to "cluster" (as
it should be and has been historically).

Fixes: #11177
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4194 from athanatos/wip-11199
Sage Weil [Fri, 27 Mar 2015 15:15:29 +0000 (08:15 -0700)]
Merge pull request #4194 from athanatos/wip-11199

ReplicatedPG: trim backfill intervals based on peer's last_backfill_star...

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4195 from athanatos/wip-11197
Sage Weil [Fri, 27 Mar 2015 15:10:20 +0000 (08:10 -0700)]
Merge pull request #4195 from athanatos/wip-11197

PG: set/clear CREATING in Primary state entry/exit

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4196 from athanatos/wip-move-code
Kefu Chai [Fri, 27 Mar 2015 02:24:22 +0000 (10:24 +0800)]
Merge pull request #4196 from athanatos/wip-move-code

osd: Wip move code

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoceph-objectstore-tool: Fix message and make it debug only to stderr
David Zafman [Tue, 24 Mar 2015 22:12:31 +0000 (15:12 -0700)]
ceph-objectstore-tool: Fix message and make it debug only to stderr

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoceph-objectstore-tool: Remove bogus comment and eliminate a debug message
David Zafman [Thu, 26 Mar 2015 22:54:48 +0000 (15:54 -0700)]
ceph-objectstore-tool: Remove bogus comment and eliminate a debug message

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoosd/: Move ReplicatedBackend methods into ReplicatedBackend.cc 4196/head
Samuel Just [Thu, 26 Mar 2015 17:50:19 +0000 (10:50 -0700)]
osd/: Move ReplicatedBackend methods into ReplicatedBackend.cc

Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoReplicatedPG: remove unused C_OnPushCommit
Samuel Just [Thu, 26 Mar 2015 17:44:00 +0000 (10:44 -0700)]
ReplicatedPG: remove unused C_OnPushCommit

Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoPG: set/clear CREATING in Primary state entry/exit 4195/head
Samuel Just [Tue, 24 Mar 2015 17:48:02 +0000 (10:48 -0700)]
PG: set/clear CREATING in Primary state entry/exit

Previously, we did not actually set it when we got a pg creation message from
the mon.  It would actually get set on the first start_peering_interval after
that point.  If we don't get that far, but do send a stat update to the mon, we
can end up with 11197.  Instead, let's just set it and clear it upon entry into
and exit from the Primary state.

Fixes: 11197
Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #4128 from dzafman/wip-11139-hammer
Samuel Just [Wed, 25 Mar 2015 15:29:31 +0000 (08:29 -0700)]
Merge pull request #4128 from dzafman/wip-11139-hammer

ceph-objectstore-tool: Use exit status 11 for incompatible import attemp...

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #4124 from ceph/wip-omap-clear
Samuel Just [Wed, 25 Mar 2015 15:27:59 +0000 (08:27 -0700)]
Merge pull request #4124 from ceph/wip-omap-clear

osd: fix omap_clear handling

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #4170 from ceph/hammer-11205
Gregory Farnum [Wed, 25 Mar 2015 04:35:29 +0000 (21:35 -0700)]
Merge pull request #4170 from ceph/hammer-11205

qa/workunits/fs/misc: fix filelock_interrupt.py

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoqa/workunits/fs/misc: fix filelock_interrupt.py 4170/head
Yan, Zheng [Mon, 2 Mar 2015 13:04:25 +0000 (21:04 +0800)]
qa/workunits/fs/misc: fix filelock_interrupt.py

Handle the case that kernel does not support fcntl.F_OFD_SETLK.
Also fix the code that checks if fnctl fails with errno == EINTR.

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

10 years agoReplicatedPG: trim backfill intervals based on peer's last_backfill_started 4194/head
Samuel Just [Tue, 24 Mar 2015 22:14:34 +0000 (15:14 -0700)]
ReplicatedPG: trim backfill intervals based on peer's last_backfill_started

Otherwise, we fail to trim the peer's last_backfill_started and get bug 11199.

1) osd 4 backfills up to 31bccdb2/mira01213209-286/head (henceforth: foo)

2) Interval change happens

3) osd 0 now finds itself backfilling to 4 (lb=foo) and osd.5
(lb=b6670ba2/mira01213209-160/snapdir//1, henceforth: bar)

4) recover_backfill causes both 4 and 5 to scan forward, so 4 has an interval
starting at foo, 5 has an interval starting at bar.

5) Once those have come back, recover_backfill attempts to trim off the
last_backfill_started, but 4's interval starts after that, so foo remains in
osd 4's interval (this is the bug)

7) We serve a copyfrom on foo (sent to 4 as well).

8) We eventually get to foo in the backfilling. Normally, they would have the
same version, but of course we don't update osd.4's interval from the log since
it should not have received writes in that interval. Thus, we end up trying to
recover foo on osd.4 anyway.

9) But, an interval change happens between removing foo from osd.4 and
completing the recovery, leaving osd.4 without foo, but with lb >= foo

Fixes: #11199
Backport: firefly
Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #4162 from athanatos/wip-11156
Sage Weil [Tue, 24 Mar 2015 19:15:21 +0000 (12:15 -0700)]
Merge pull request #4162 from athanatos/wip-11156

ReplicatedPG::promote_object: check scrubber and block if necessary

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4163 from athanatos/wip-revert-degraded-writes
Samuel Just [Tue, 24 Mar 2015 16:31:13 +0000 (09:31 -0700)]
Merge pull request #4163 from athanatos/wip-revert-degraded-writes

Wip revert degraded writes

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4152 from ceph/wip-11145
Sage Weil [Tue, 24 Mar 2015 01:11:08 +0000 (18:11 -0700)]
Merge pull request #4152 from ceph/wip-11145

rgw: shut down timer before erroring out

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agorgw: shut down timer before erroring out 4152/head
Yehuda Sadeh [Mon, 23 Mar 2015 23:21:14 +0000 (16:21 -0700)]
rgw: shut down timer before erroring out

Fixes: #11145
Backport: hammer

Clean up initialization timer, otherwise if we error out, we'll assert.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoReplicatedPG::promote_object: check scrubber and block if necessary 4162/head
Samuel Just [Fri, 20 Mar 2015 22:28:15 +0000 (15:28 -0700)]
ReplicatedPG::promote_object: check scrubber and block if necessary

Otherwise, we might attempt to promote into an in-progress scrub
interval causing 11156.  I would have added a return value to
promote_object(), but could not find an existing user which
cared to distinguish the cases, even with a null op passed.
All existing users are in maybe_handle_cache.  The ones which
pass a null op are for promoting the object in parallel
with a proxy -- a case where not actually performing the promote
does not really matter.

Fixes: #11156
Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #4125 from dzafman/wip-11176-hammer
Loic Dachary [Mon, 23 Mar 2015 19:37:14 +0000 (20:37 +0100)]
Merge pull request #4125 from dzafman/wip-11176-hammer

ceph-objectstore-tool: Output only unsupported features when incomatible

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4145 from ceph/wip-hammer-rgw
Sage Weil [Mon, 23 Mar 2015 19:30:47 +0000 (12:30 -0700)]
Merge pull request #4145 from ceph/wip-hammer-rgw

Wip hammer rgw

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoosd/: s/is_degraded_object/is_degraded_or_backfilling_object 4163/head
Samuel Just [Tue, 17 Feb 2015 18:16:57 +0000 (10:16 -0800)]
osd/: s/is_degraded_object/is_degraded_or_backfilling_object

Currently, this method also returns true if the object is backfilling.
This commit was reverted earlier in the branch in order to make the
other reverts clean.  It's actually a nice rename though, so I'm
re-cherry-picking it.

Signed-off-by: Samuel Just <sjust@redhat.com>
Conflicts:
src/osd/ReplicatedPG.cc

10 years agoRevert "osd/: update peer_missing and local missing if we write a degraded object"
Samuel Just [Mon, 23 Mar 2015 18:54:57 +0000 (11:54 -0700)]
Revert "osd/: update peer_missing and local missing if we write a degraded object"

This reverts commit c632fecb87e292eb73161f36d4e6df6f077fae77.

10 years agoRevert "append_log: use remove_snap_mapped_object"
Samuel Just [Mon, 23 Mar 2015 18:54:44 +0000 (11:54 -0700)]
Revert "append_log: use remove_snap_mapped_object"

This reverts commit 964d17756f9e49002eb96c4f27a3f41da0880f71.

10 years agoRevert "osd/: don't block writes on degraded objects"
Samuel Just [Mon, 23 Mar 2015 18:50:10 +0000 (11:50 -0700)]
Revert "osd/: don't block writes on degraded objects"

This reverts commit f9abffbb2461b5988c0435ee2f7771eca028f29f.

10 years agoRevert "ReplicatedPG: block writes on degraded objects for ec pools"
Samuel Just [Mon, 23 Mar 2015 18:48:38 +0000 (11:48 -0700)]
Revert "ReplicatedPG: block writes on degraded objects for ec pools"

This reverts commit 1f165d2547af844de8406b35e89d371d56730f09.

10 years agoRevert "Merge pull request #3641 from athanatos/wip-10731"
Samuel Just [Mon, 23 Mar 2015 18:46:35 +0000 (11:46 -0700)]
Revert "Merge pull request #3641 from athanatos/wip-10731"

This reverts commit 54a22236a00ab18ec62c6e7df1117055d5fd0ef1, reversing
changes made to 7eca03e290f278bdf3a9613e0f383ec49f40b645.

Conflicts:
src/include/ceph_features.h

10 years agoRevert "osd/: s/is_degraded_object/is_degraded_or_backfilling_object"
Samuel Just [Mon, 23 Mar 2015 18:43:52 +0000 (11:43 -0700)]
Revert "osd/: s/is_degraded_object/is_degraded_or_backfilling_object"

This reverts commit 25f9363b90a66b8bf3c14cf99ee417823fc84fbf.

10 years agorgw: update makefile to enable civetweb config 4145/head
Yehuda Sadeh [Fri, 27 Feb 2015 16:14:41 +0000 (08:14 -0800)]
rgw: update makefile to enable civetweb config

Fixes: #10965
Backport: hammer, firefly

Civetweb compilation now includes conf header to enable ipv6.

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

10 years agocivetweb: update submodule
Yehuda Sadeh [Fri, 27 Feb 2015 16:14:27 +0000 (08:14 -0800)]
civetweb: update submodule

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

10 years agorgw: pass civetweb configurables to civetweb
Yehuda Sadeh [Tue, 17 Feb 2015 23:05:40 +0000 (15:05 -0800)]
rgw: pass civetweb configurables to civetweb

Fixes: #10907
Backport: firefly

Pass any configurables in the rgw frontends config line to civetweb.

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

10 years agorgw: don't overwrite bucket / object owner when setting acls
Yehuda Sadeh [Fri, 27 Feb 2015 23:32:50 +0000 (15:32 -0800)]
rgw: don't overwrite bucket / object owner when setting acls

Fixes: #10978
Backport: hammer, firefly

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

10 years agoRevert "ReplicatedPG: only allow a degraded write if we have at least min_size copies"
Samuel Just [Mon, 23 Mar 2015 18:16:27 +0000 (11:16 -0700)]
Revert "ReplicatedPG: only allow a degraded write if we have at least min_size copies"

This reverts commit 48466f8d7ce2b6762077f3fc686ada5648021517.

10 years agoRevert "Merge pull request #3911 from athanatos/wip-11057"
Samuel Just [Mon, 23 Mar 2015 18:16:06 +0000 (11:16 -0700)]
Revert "Merge pull request #3911 from athanatos/wip-11057"

This reverts commit 05bb9c9870781941b2e362e6cb9b5ec7fb72e97e, reversing
changes made to b780048c48784a59348d030b5be720d270649a36.

10 years agoMerge pull request #4134 from dzafman/wip-dzman-hammer
Loic Dachary [Sun, 22 Mar 2015 23:41:17 +0000 (00:41 +0100)]
Merge pull request #4134 from dzafman/wip-dzman-hammer

Minor man page improvement

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: Regenerate man/ceph.8 based on ceph.rst changes 4134/head
David Zafman [Fri, 20 Mar 2015 22:38:33 +0000 (15:38 -0700)]
doc: Regenerate man/ceph.8 based on ceph.rst changes

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agodoc: Break ceph osd pool get into sections based on pool type
David Zafman [Fri, 20 Mar 2015 22:33:39 +0000 (15:33 -0700)]
doc: Break ceph osd pool get into sections based on pool type

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoerasure code: add shec's documentation / change default layout 4131/head
Takeshi Miyamae [Wed, 18 Feb 2015 11:42:50 +0000 (20:42 +0900)]
erasure code: add shec's documentation / change default layout

Signed-off-by: Takeshi Miyamae <miyamae.takeshi@jp.fujitsu.com>
(cherry picked from commit cd708e216f8655eb91184e68fb6ef58949630101)

10 years agoceph-objectstore-tool: Use exit status 11 for incompatible import attempt 4128/head
David Zafman [Sat, 21 Mar 2015 00:48:01 +0000 (17:48 -0700)]
ceph-objectstore-tool: Use exit status 11 for incompatible import attempt

This is used so upgrade testing doesn't generate false failure.
Fixes: #11139
Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoosd: fix omap digest clearing for omap write ops 4124/head
Sage Weil [Sat, 21 Mar 2015 00:16:26 +0000 (17:16 -0700)]
osd: fix omap digest clearing for omap write ops

1. setvals clears the digest, even for a new object, since we aren't doing
anything clever with the digest for the provided keys (yet).

2. setheader clears the digest, always, since we aren't doing anything
clever.

Backport: hammer
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/MemStore: make omap_clear zap the omap header too
Sage Weil [Sat, 21 Mar 2015 00:08:01 +0000 (17:08 -0700)]
os/MemStore: make omap_clear zap the omap header too

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoceph_test_rados_api_aio: verify omap_clear clears header, too
Sage Weil [Sat, 21 Mar 2015 00:07:51 +0000 (17:07 -0700)]
ceph_test_rados_api_aio: verify omap_clear clears header, too

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoceph-objectstore-tool: Output only unsupported features when incomatible 4125/head
David Zafman [Fri, 20 Mar 2015 23:57:40 +0000 (16:57 -0700)]
ceph-objectstore-tool: Output only unsupported features when incomatible

Fixes: #11176
Backport: firefly, giant

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoMerge pull request #4040 from dzafman/wip-11092-11093
Dan Mick [Fri, 20 Mar 2015 23:39:00 +0000 (16:39 -0700)]
Merge pull request #4040 from dzafman/wip-11092-11093

Fix ceph pg dump_stuck with multiple options

Reviewed-by: Dan Mick <dmick@redhat.com>
10 years agoMerge pull request #4107 from ceph/wip-11102
Sage Weil [Fri, 20 Mar 2015 00:16:45 +0000 (17:16 -0700)]
Merge pull request #4107 from ceph/wip-11102

osd: only complain about stored vs actual digest if all peers support it

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoosd: only complain about stored vs actual digest if all peers support it 4107/head
Sage Weil [Thu, 19 Mar 2015 23:27:17 +0000 (16:27 -0700)]
osd: only complain about stored vs actual digest if all peers support it

If we have a mixed cluster of hammer and pre-hammer OSDs, we will fall back
to using 0 as the initial crc32c value.  However, if the primary has a
stored digest, it currently compares its value to the reported value (w/
the wrong initial value) and complains.

There are two possible fixes:
 - avoid storing a digest if all peers don't support it, or
 - avoid complaining on scrub if all peers don't support it.

The latter is easier, and this fix also has the benefit of fixing the bug
even for clusters where this has already happened.

Fixes: #11102
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoPG::find_best_info: reject infos with old last_epoch_started
Samuel Just [Thu, 19 Mar 2015 00:42:40 +0000 (17:42 -0700)]
PG::find_best_info: reject infos with old last_epoch_started

See doc/dev/osd_internals/last_epoch_started.rst

Reviewed-by: Sage Weil <sage@redhat.com>
Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3988 from ceph/wip-refine-build-configuration-hammer
Sage Weil [Thu, 19 Mar 2015 18:31:31 +0000 (11:31 -0700)]
Merge pull request #3988 from ceph/wip-refine-build-configuration-hammer

Refine build configuration for hammer

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4105 from athanatos/wip-11110
Samuel Just [Thu, 19 Mar 2015 16:41:58 +0000 (09:41 -0700)]
Merge pull request #4105 from athanatos/wip-11110

Wip 11110

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoinit-radosgw*: don't require rgw_socket_path to be defined
Yehuda Sadeh [Thu, 19 Mar 2015 03:55:24 +0000 (20:55 -0700)]
init-radosgw*: don't require rgw_socket_path to be defined

Fixes: #11159
Backport: hammer, firefly

Scripts required rgw_socket_path to exist in order to start radosgw.
This is not needed.

Reported-by: Dan Mick <dmick@redhat.com>
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 6823bcdcd0ce72cd223e809291f46d82da76115c)

10 years agoMerge pull request #4064 from dachary/wip-10488-jerasure-idempotent
Samuel Just [Thu, 19 Mar 2015 15:52:53 +0000 (08:52 -0700)]
Merge pull request #4064 from dachary/wip-10488-jerasure-idempotent

mon: informative message when erasure-code-profile set fails

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4066 from dachary/wip-11144-erasure-code-profile-rm
Samuel Just [Thu, 19 Mar 2015 15:52:45 +0000 (08:52 -0700)]
Merge pull request #4066 from dachary/wip-11144-erasure-code-profile-rm

osd: erasure-code-profile incremental rm before set

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoPG: ensure that info.last_epoch_started only increases 4105/head
Samuel Just [Wed, 18 Mar 2015 19:11:07 +0000 (12:11 -0700)]
PG: ensure that info.last_epoch_started only increases

See doc/dev/osd_internals/last_epoch_started.rst

Fixes: #11110
Signed-off-by: Samuel Just <sjust@redhat.com>