Commit Graph

40603 Commits

Author SHA1 Message Date
Samuel Just
e9d6096f25 ReplicatedPG: remove unused C_OnPushCommit
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-03-26 10:44:00 -07:00
Josh Durgin
887354099e Merge pull request #4113 from wonzhq/rbd-fix
rbd: misc fixes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-03-26 10:06:37 -07:00
John Spray
6413209ef3 mds: include damaged in MDSMap::dump
Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-26 15:48:55 +00:00
John Spray
3b2a0917e8 mds: update peer failure response to account for damaged
...by calling get_down_mds_set instead of get_failed_mds_set.

Also remove a redundant if(true) around this region.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-26 13:11:44 +00:00
John Spray
f311bb77e3 mds: add get_down_mds_set method
For places where we would like to treat failed
and damaged MDS ranks the same, like detecting
when someone has dropped offline.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-26 13:11:44 +00:00
John Spray
7eccf920ba mds: account for 'damaged' in MDSMap::is_degraded
Fixes: #11218
Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-26 13:11:44 +00:00
John Spray
aae265bfe1 mds: clarify MDBalancer::send_heartbeat
The initial is_degraded() check guarantees that
the 'in' set is equal to the 'up' set.  Later,
this calls get_mds_set and assigns it to a variable
called 'up'.

It's clearer to use get_up_mds_set into the variable
called up (this was confusing when debugging #11218
which was itself a result of is_degraded() ignoring
damaged ranks).

Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-26 12:54:53 +00:00
Yan, Zheng
c7d5c02680 test_libcephfs: do cleanup in ReleaseMounted test
Fixes: #11236
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-03-26 15:21:52 +08:00
Loic Dachary
9008a3391d Merge pull request #4188 from XinzeChi/wip-test-1
test: add compile-command for test_ceph_daemon.py

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-26 07:45:05 +01:00
Xinze Chi
9418e432ad test: add compile-command for test_ceph_daemon.py
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
2015-03-26 13:58:33 +08:00
Jianpeng Ma
aa6a46cfd9 common: print hexadecimal for ghobject_t.generation & shard_id
In filestore, it use hexadecimal for ghobject_t.generation &
shard_id. Make the same.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-03-26 13:51:02 +08:00
Michal Jarzabek
b9e89fcb0b mon/OSDMonitor: remove trailing whitespaces
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2015-03-25 21:22:31 +00:00
Loic Dachary
896310c0b8 Merge pull request #4181 from ceph/wip-rpm-systemd-conditional-syntax
ceph.spec.in: fix _with_systemd conditional

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-25 21:40:22 +01:00
Gregory Farnum
97234c94ee Merge pull request #4182 from ceph/wip-replicatedpg-signed
ReplicatedPG: fix a signed/unsigned comparison warning

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-03-25 13:39:04 -07:00
Greg Farnum
e51761233e ReplicatedPG: fix a signed/unsigned comparison warning
This mismatch about whether pool IDs are signed or unsigned is
a persistent annoyance. I'm now casting the unsigned down to signed space
because apparently the OSD is using negative IDs for temporary object
namespaces.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2015-03-25 12:03:38 -07:00
Ken Dreyer
c5cf81dd91 ceph.spec.in: fix _with_systemd conditional
The RPM conditional needs a "?" in the event that it is not defined.
2015-03-25 12:16:03 -06:00
Greg Farnum
0c6bd2775f client: Hold on to exclusive caps on directories we "own"
If a directory is complete, we *really* want to keep the exclusive cap
so that we don't end up needing to do MDS lookup requests on every cache
miss.

Fixes: #11226

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2015-03-25 11:10:56 -07:00
Sage Weil
edf64dd564 osd: do not double-write log entries
The pg_log.add() call already dirties the log such that the later
write_log() call will write it.  There is no need to encode it separately
here and then explicitly omap_setkeys() it.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-25 10:34:45 -07:00
Sage Weil
34c7d2c527 osd: combine info and log writes into single omap_setkeys
This saves a surprising amount of CPU.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-25 10:32:02 -07:00
Sage Weil
b486e58695 osd: pass map to write_info instead of txn
No real change yet.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-25 10:32:02 -07:00
Sage Weil
2724ce2d1b Merge remote-tracking branch 'gh/hammer'
Conflicts:
	src/gmock
2015-03-25 10:30:20 -07:00
Samuel Just
ddf0292250 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>
2015-03-25 10:29:07 -07:00
Sage Weil
1b81d8c029 Merge pull request #3688 from XinzeChi/wip-clear-transaction
osd: new transcation if needed

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-03-25 10:28:25 -07:00
Sage Weil
cc3527a51e Merge pull request #3870 from majianpeng/cache-tier
Cache tier bug fixs

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-25 10:27:56 -07:00
Sage Weil
6748ff9522 Merge pull request #3679 from mslovy/wip-findObjectContext-opt
ReplicatedPG:: find_object_context clear extra creation (head,snapdir)

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-25 10:24:43 -07:00
Sage Weil
82d9153f01 Merge pull request #4065 from majianpeng/pgop-memleak
osd/ReplicatedPG: Fix a memory leak in do_pg_op.

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-25 10:24:17 -07:00
Sage Weil
29d0d46db8 Merge pull request #3974 from majianpeng/fgetattr-fix
os/FileStore: For getxattr, enlarge the value size avoid try again.

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-25 10:24:00 -07:00
Sage Weil
c639ce51ac Merge pull request #3604 from yghannam/yazen-testing
crc32c: add aarch64 optimized crc32c implementation

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-25 10:06:46 -07:00
Sage Weil
dca722ec7b Merge pull request #4073 from jdurgin/wip-lttng-daemon
common, global: use lttng ust functions for handling fork-like calls

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-25 10:06:13 -07:00
Danny Al-Gaaf
24aeb78bb0 Merge pull request #3916 from ceph/wip-rpm-no-ghost-socket-dir
ceph.spec.in: fix handling of /var/run/ceph

Reviewed-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-25 17:27:14 +01:00
Kefu Chai
8654b65740 Merge pull request #4000 from ceph/wip-da-SCA-20150312
Fixes for Covertity issues

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-03-26 00:12:35 +08:00
Samuel Just
6994648bc4 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>
2015-03-25 08:29:31 -07:00
Samuel Just
0ff3d58757 Merge pull request #4124 from ceph/wip-omap-clear
osd: fix omap_clear handling

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-03-25 08:27:59 -07:00
Loic Dachary
dc85cb946d Merge pull request #4179 from ceph/wip-11065
unit/tox tests structure for ceph-disk

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-25 16:27:20 +01:00
Alfredo Deza
6e6771e616 ceph-disk: add test files to EXTRA_DIST
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2015-03-25 10:10:43 -04:00
Alfredo Deza
b3019824bb ceph-disk: remove double import
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2015-03-25 09:47:13 -04:00
Alfredo Deza
0f267c15ea ceph-disk: create initial structure for tox/unit tests
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2015-03-25 09:46:16 -04:00
Yan, Zheng
89fd137fb4 client: conclude -ENOENT when there is null dentry
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-03-25 18:20:39 +08:00
Yan, Zheng
ba62027189 client: don't clear COMPLETE flag when trimming null dentry
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-03-25 18:20:39 +08:00
Yan, Zheng
73e3358000 mds: make sure readdir reply include Fs cap for directory
filelock in LOCK_XSYN state does not allow Fs cap. so client can't
mark directory as complete when handling the readdir reply.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-03-25 18:20:38 +08:00
Gregory Farnum
e7e0ea626e Merge pull request #4170 from ceph/hammer-11205
qa/workunits/fs/misc: fix filelock_interrupt.py

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-03-24 21:35:29 -07:00
Yan, Zheng
6f218b1603 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 4ececa3dc4)
2015-03-25 11:10:56 +08:00
Yan, Zheng
2d6277683b mds: drop replayed requests when seesion is closed
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-03-25 10:47:22 +08:00
Yan, Zheng
8f91547654 mds: fix crash when killing busy session
journal_close_session() has already freed pending_prealloc_inos

Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-03-25 10:38:28 +08:00
Samuel Just
1388d6bd94 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>
2015-03-24 15:29:29 -07:00
Sage Weil
4dbb9c872e Merge pull request #4162 from athanatos/wip-11156
ReplicatedPG::promote_object: check scrubber and block if necessary

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-24 12:15:21 -07:00
Sage Weil
2c181c2ae8 Merge pull request #4164 from athanatos/wip-revert-degraded-writes-release-notes
release-notes.rst: update for degraded writes revert
2015-03-24 09:43:38 -07:00
Samuel Just
0f92f346a3 release-notes.rst: update for degraded writes revert
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-03-24 09:39:42 -07:00
Samuel Just
836fdc512d Merge pull request #4163 from athanatos/wip-revert-degraded-writes
Wip revert degraded writes

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-24 09:31:13 -07:00
Sage Weil
40147d8c5e Merge pull request #4161 from trhoden/cephdeploy_not_new
doc: no longer call out ceph-deploy as new
2015-03-24 09:23:38 -07:00