Commit Graph

36055 Commits

Author SHA1 Message Date
Sage Weil
260933b110 Merge branch 'wip-9658' into giant 2014-10-06 15:52:24 -07:00
Sage Weil
031ef0551e Merge pull request #2645 from ceph/wip-9663
client: clean-up objecter on failed client init

Reviewed-by: Sage Weil <sage@redhat.com>
2014-10-06 09:37:32 -07:00
Sage Weil
6b9e20ac8d ceph.spec: make ceph -> python-ceph dependency specify version
It does this indirectly via ceph -> ceph-common -> python-ceph, but do so
here too for clarity/consistency.

Signed-off-by: Sage Weil <sage@redhat.com>
2014-10-06 09:15:29 -07:00
Loic Dachary
07b86c43a9 Merge pull request #2642 from johnugeorge/wip-9492-crush-giant
Crush: Backporting fixes for #9492 to giant

Reviewed-by: Loic Dachary <loic-201408@dachary.org>
2014-10-06 09:51:05 +02:00
Noah Watkins
fe57fab2e6 client: clean-up objecter on failed client init
During mount() the objecter isn't shutdown if the mon client fails to
initialize. Objecter asserts in destructor expect it to have been
shutdown but this skipped.

hadoop@plana85:~$ ./hadoop/bin/hadoop fs -ls /
14/10/05 12:35:50 WARN util.NativeCodeLoader: Unable to load native-hadoop library for your platform... using builtin-java classes where applicable
osdc/Objecter.cc: In function 'virtual Objecter::~Objecter()' thread 7ff422705700 time 2014-10-05 12:35:51.090776
osdc/Objecter.cc: 3927: FAILED assert(!m_request_state_hook)
 ceph version 0.85-981-g25bcc39 (25bcc39bb8)
 1: (ceph::__ceph_assert_fail(char const*, char const*, int, char const*)+0x7f) [0x7ff3f5c28f7f]
 2: (Objecter::~Objecter()+0x397) [0x7ff3f5bca707]
 3: (Objecter::~Objecter()+0x9) [0x7ff3f5bca8b9]
 4: (Client::~Client()+0x7d) [0x7ff3f5b6770d]
 5: (Client::~Client()+0x9) [0x7ff3f5b680a9]
 6: (ceph_mount_info::mount(std::string const&)+0x149) [0x7ff3f5b1fa49]
 7: (ceph_mount()+0x4e) [0x7ff3f5b1dcbe]
 8: (Java_com_ceph_fs_CephMount_native_1ceph_1mount()+0xb7) [0x7ff4158b1c97]
 9: [0x7ff41839dd68]
 NOTE: a copy of the executable, or `objdump -rdS <executable>` is needed to interpret this.
terminate called after throwing an instance of 'ceph::FailedAssertion'
Aborted

fixes: #9663

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2014-10-05 13:15:13 -07:00
Johnu George
1858f06c80 Crush: Ensuring at most num-rep osds are selected
Crush temporary buffers are allocated as per replica size configured
by the user.When there are more final osds (to be selected as per
rule) than the replicas, buffer overlaps and it causes crash.Now, it
ensures that at most num-rep osds are selected even if more number of
osds are allowed by indep rule. The fix for firstn rules is already
merged as part of bug #9492. Required test files are added.

Fixes: #9492

Signed-off-by: Johnu George johnugeo@cisco.com
(cherry picked from commit 234b066ba0)
2014-10-04 11:27:17 -07:00
Johnu George
01e389aeb6 Crush: Ensuring at most num-rep osds are selected
Crush temporary buffers are allocated as per replica size configured
by the user.When there are more final osds (to be selected as per
rule) than the replicas, buffer overlaps and it causes crash.Now, it
ensures that at most num-rep osds are selected even if more number of
osds are allowed by the rule.

Fixes: #9492

Signed-off-by: Johnu George <johnugeo@cisco.com>
(cherry picked from commit 6b4d1aa997)
2014-10-04 11:27:17 -07:00
Sage Weil
25bcc39bb8 Merge pull request #2640 from ceph/wip-9657
messages: provide an explicit COMPAT_VERSION in MMDSBeacon

Reviewed-by: Sage Weil <sage@redhat.com>
2014-10-03 17:02:56 -07:00
Sage Weil
5c6c366d2a debian/control: fix python-ceph -> ceph file move to allow upgrades
See fe3434f41c.

Signed-off-by: Sage Weil <sage@redhat.com>
2014-10-03 16:22:57 -07:00
Greg Farnum
35fd2722cc messages: provide an explicit COMPAT_VERSION in MMDSBeacon
We weren't setting an explicit compat version and so the Message
was setting it to the head version, breaking communication with
older daemons.

Fixes: #9657
Signed-off-by: Greg Farnum <greg@inktank.com>
2014-10-03 16:06:53 -07:00
Sage Weil
7f6c31bf6e debian/control: BuildDepend on lsb-release
debian/rules uses it to make lttng build conditional.

Signed-off-by: Sage Weil <sage@redhat.com>
2014-10-03 13:45:48 -07:00
Sage Weil
8d79181dd8 Merge pull request #2635 from dachary/wip-9653-ceph-disk-bootstrap-osd-giant
ceph-disk: bootstrap-osd keyring ignores --statedir (giant)
2014-10-03 11:58:54 -07:00
Sage Weil
027f74f998 Merge pull request #2637 from dachary/wip-9245-test-mon-pending-giant
mon: obsolete osdmonitor_prepare_command (giant)
2014-10-03 11:24:44 -07:00
Loic Dachary
73d5bdb987 tests: remove tests requiring osdmonitor_prepare_command
Although they have been useful, their maintenance and fragility caused
more trouble than their benefits.

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
(cherry picked from commit 038de0031b)
2014-10-03 19:00:34 +02:00
Loic Dachary
e8657814a6 mon: obsolete osdmonitor_prepare_command
And the mon_advanced_debug_mode option that is only used in the context
of osdmonitor_prepare_command.

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

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
(cherry picked from commit 2abc8f400f)
2014-10-03 19:00:16 +02:00
Loic Dachary
d0c2d7d572 test: minor case fix
Signed-off-by: Loic Dachary <loic-201408@dachary.org>
(cherry picked from commit 6f69837456)
2014-10-03 19:00:00 +02:00
Loic Dachary
eb2f0f497f ceph-disk: bootstrap-osd keyring ignores --statedir
The STATEDIR variable is used to initialize the bootstrap-osd keyring
before it gets a chance to be overriden by --statedir. Replace it with
{statedir} so that it can be substituted after all options have been
parsed.

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

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
(cherry picked from commit fa0bd06b46)
2014-10-03 15:53:28 +02:00
Samuel Just
b1ca1f23ff Merge pull request #2525 from ceph/wip-9487
RFC: initialize purged_snaps on backfill

Reviewed-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2014-10-01 13:45:27 -07:00
Sage Weil
7aacccd0bb Merge pull request #2620 from ceph/revert-2604-wip-9113
Revert "ReplicatedPG: clean out completed trimmed objects as we go"
2014-10-01 13:23:21 -07:00
Samuel Just
0f731ae580 Revert "ReplicatedPG: clean out completed trimmed objects as we go" 2014-10-01 13:18:46 -07:00
Sage Weil
da9ae5c92e ceph.spec: fix typo
Signed-off-by: Sage Weil <sage@redhat.com>
2014-10-01 12:33:38 -07:00
Sage Weil
b1d5dc6bc4 Merge pull request #2614 from ceph/wip-rpm-epoch
rpm: set epoch 1 to match fedora

Reviewed-by: Boris Ranto <branto@redhat.com>
2014-10-01 12:23:44 -07:00
Yehuda Sadeh
f26ba0461e Merge branch 'wip-9013' into giant 2014-10-01 10:28:38 -07:00
Yehuda Sadeh
63d0ec7b2c rgw: add civetweb as a default frontend
Fixes: #9013
Originally the configurable was empty, now setting explicitly both
fastcgi and civetweb (on port 7480).

Reviewed-by: Sage Weil <sage@redhat.com>
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2014-10-01 10:27:51 -07:00
Sage Weil
8388836208 ceph.spec.: add epoch
This is done in fedora packaging.  Do it here too so that you can move
between upstream packages (from ceph.com) and fedora and other derivatives
will builds.

Backport: firefly, dumpling
Signed-off-by: Sage Weil <sage@redhat.com>
2014-10-01 06:02:02 -07:00
Sage Weil
17544a460a Merge pull request #2615 from ceph/wip-fsls-json
mon: fix JSON `fs ls` output

Reviewed-by: Sage Weil <sage@redhat.com>
2014-10-01 05:54:45 -07:00
John Spray
a470c96e6b mon: fix JSON fs ls output
A missing list terminator was causing unparseable output.

Signed-off-by: John Spray <john.spray@redhat.com>
2014-10-01 12:09:16 +01:00
Josh Durgin
fd5af13949 Merge pull request #2564 from ceph/wip-8587
rgw: subuser creation fixes

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2014-09-30 17:24:02 -07:00
Sage Weil
544d8255c9 Merge pull request #2613 from ceph/wip-8822
osd: swap state spinlock for atomic_t

Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-09-30 14:45:27 -07:00
Sage Weil
62e2bca8d8 osd: swap state spinlock for atomic_t
We are hitting a strange issue with valgrind and pthread spinlocks. Avoid
the issue by using an atomic_t here (which is simpler anyway).

Avoids: #8822
Backport: firefly
Signed-off-by: Sage Weil <sage@redhat.com>
2014-09-30 11:56:30 -07:00
Gregory Farnum
e30969b19e Merge pull request #2612 from ceph/wip-9562-backport
osdc/Filer: drop probe/purge locks before calling objecter

Reviewed-by: Greg Farnum <greg@inktank.com>
2014-09-30 10:49:05 -07:00
John Spray
a8ac4b62a5 osdc/Filer: drop probe/purge locks before calling objecter
Fixes: #9562

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 8dc94a2d8c)
2014-09-30 18:46:25 +01:00
Greg Farnum
0ea20a668c Locker: accept ctime updates from clients without dirty write caps
The ctime changes any time the inode does. That can happen even without
the file itself having changed, so we'd better accept the update whenever
the auth caps have dirtied, without worrying about the file caps!

Fixes: #9514
Backport: firefly

Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
2014-09-30 10:24:51 -07:00
Loic Dachary
9c4616dcd2 Merge pull request #2556 from dachary/wip-9572-erasure-code-blaumroth
erasure-code: restore jerasure BlaumRoth default w

Reviewed-by: Sage Weil <sage@redhat.com>
2014-09-30 01:48:26 +02:00
Sage Weil
5281ac7aa9 Merge pull request #2601 from ceph/wip-python-flask
debian: python-flask is needed by ceph, not python-ceph

Reviewed-by: Loic Dachary <loic@dachary.org>
2014-09-29 16:24:50 -07:00
Sage Weil
fe3434f41c debian: move ceph_rest_api.py into ceph
Signed-off-by: Sage Weil <sage@redhat.com>
2014-09-29 14:28:32 -07:00
Sage Weil
8cda623e0b ceph.spec.in: move ceph_rest_api.py into ceph
Signed-off-by: Sage Weil <sage@redhat.com>
2014-09-29 14:24:01 -07:00
Sage Weil
0d1a4171c1 Merge pull request #2602 from athanatos/wip-9574
PG: check full ratio again post-reservation

Reviewed-by: Sage Weil <sage@redhat.com>
2014-09-29 14:14:40 -07:00
Sage Weil
acd49892df Merge pull request #2604 from athanatos/wip-9113
ReplicatedPG: clean out completed trimmed objects as we go

Reviewed-by: Sage Weil <sage@redhat.com>
2014-09-29 14:02:15 -07:00
Samuel Just
78fc7b8198 Merge pull request #2549 from ceph/wip-9545
os/FileJournal: do not request sync while shutting down

Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-09-29 13:54:31 -07:00
Samuel Just
f91c571ef6 Merge pull request #2550 from ceph/wip-8629
osd: fix cache_evict vs make_writeable/finish_ctx snapdir bug #8629

Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-09-29 13:52:21 -07:00
Samuel Just
ffda34c4be Merge pull request #2510 from somnathr/wip-obj-delete-fix
FileStore: Race condition during object delete is fixed

Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-09-29 13:44:37 -07:00
Sage Weil
b2416240b8 ceph.spec: fix python-flask dependency
This is needed by ceph-rest-api, which is in ceph.rpm; it's not related to
python-ceph (except that ceph-rest-api happens to require that too).

Backport: firefly
Signed-off-by: Sage Weil <sage@redhat.com>
2014-09-29 13:44:03 -07:00
Sage Weil
e42424e777 debian: python-flask is needed by ceph, not python-ceph
It's used by ceph-rest-api which is in the 'ceph' (server) package.

Backport: firefly
Signed-off-by: Sage Weil <sage@redhat.com>
2014-09-29 13:40:18 -07:00
Sage Weil
614157c288 Merge pull request #2598 from ceph/wip-9582
librados: fix other timeout segfault

Reviewed-by: Greg Farnum <greg@inktank.com>
2014-09-29 13:08:10 -07:00
Sage Weil
9af9df42f2 Merge pull request #2594 from dachary/wip-9620-test-mon-thrash
qa/workunits/cephtool/test.sh: fix thrash (ultimate)

Reviewed-by: Sage Weil <sage@redhat.com>
2014-09-29 08:18:36 -07:00
Loic Dachary
beade63a17 qa/workunits/cephtool/test.sh: fix thrash (ultimate)
Keep the osd trash test to ensure it is a valid command but make it a
noop by giving it a zero argument (meaning thrash 0 OSD maps).

Remove the loops that were added after the command in an attempt to wait
for the cluster to recover and not pollute the rest of the tests. Actual
testing of osd thrash would require a dedicated cluster because it the
side effects are random and it is unnecessarily difficult to ensure they
are finished.

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

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
2014-09-29 13:47:06 +02:00
Dan van der Ster
f8ac2248af ceph-disk: add Scientific Linux as a Redhat clone
Scientific Linux is a RHEL clone and needs to use partx.

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
(cherry picked from commit 5ca7ea5b53)
2014-09-26 17:46:15 -07:00
Sage Weil
5c2984e6e1 Merge pull request #2531 from dachary/wip-9536-isa-alignment
erasure-code: isa plugin alignment fixes

Reviewed-by: Sage Weil <sage@redhat.com>
2014-09-25 14:05:57 -07:00
Sage Weil
d851c3f233 osd: improve debug output for do_{notifies,queries,infos}
Hunting #9389

Signed-off-by: Sage Weil <sage@redhat.com>
2014-09-25 13:51:46 -07:00