Commit Graph

44973 Commits

Author SHA1 Message Date
Greg Farnum
05b0c7816e Merge branch 'wip-yrf-fix1' of git://github.com/H3C/ceph into infernalis
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-10-07 10:47:21 -07:00
Greg Farnum
6aac312240 Merge branch 'wip-13256' of git://github.com/ukernel/ceph into infernalis
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-10-07 10:45:36 -07:00
John Spray
858059ed01 qa: avoid using sudo in fsstress
This test required root in order to copy its built
binary into /usr (presumably to avoid rebuilding it).

That's not really a good thing anyway because there's
no guarantee that a binary in that path is the binary
we wanted, so just run the thing straight out of /tmp.  The
build is really quick anyway.

Signed-off-by: John Spray <john.spray@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-10-07 10:44:43 -07:00
Daniel Gryniewicz
52ef6175c7 Merge pull request #6186 from ceph/wip-12913-2
cls_rgw: fix bucket listing when dealing with invisible entries
2015-10-07 13:09:59 -04:00
Sage Weil
1d4df5d331 Merge pull request #6185 from liewegas/wip-13382
osd/PG: fix generate_past_intervals

Reviewed-by: David Zafman <dzafman@redhat.com>
2015-10-07 11:06:09 -04:00
Sage Weil
7e8432a259 Merge pull request #6182 from liewegas/wip-13379
mon: do not remove proxied sessions

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2015-10-06 20:51:33 -04:00
Sage Weil
98cbf0380e 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 70316541bb.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-10-06 14:35:35 -04:00
branto1
e5a6529afc Merge pull request #6171 from SUSE/wip-infernalis-obs
Get infernalis to build in openSUSE Build Service

Reviewed-by: Boris Ranto <branto@redhat.com>
2015-10-06 18:05:52 +02:00
Sage Weil
fb50ff6250 mon: do not remove proxied sessions
A proxied session (see handle_forward) isn't registered, so it doesn't
need remove_session.  Moreover, s->con is null, so it will crash in
remove_session.

Fixes: #13379
Signed-off-by: Sage Weil <sage@redhat.com>
2015-10-06 10:54:50 -04:00
Sage Weil
4f54a0dd7c Merge pull request #6181 from athanatos/wip-13323
ReplicatedPG: consider IGNORE_CACHE for all maybe_handle_cache calls

Reviewed-by: Sage Weil <sage@redhat.com>
2015-10-06 10:44:44 -04:00
Nathan Cutler
1045291594 ceph.spec.in: remove comments regarding ceph UID/GID in SUSE
It is possible that the ceph user/group will not have fixed UID/GID in SUSE.
Instead, it is possible that the ceph package will depend on a separate package
whose sole purpose will be to create the ceph user/group if they do not exist.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 15:18:53 +02:00
Nathan Cutler
800d974610 ceph.spec.in: enable OBS post-build-checks to find systemd-tmpfiles
The openSUSE Build Service runs a number of "post-build checks" after the RPMs
have been generated. One of these tests the RPM scriptlets for idempotence.
Without this line in the specfile, the check fails on SLE_12 because it cannot
find the systemd-tmpfiles binary.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 15:18:53 +02:00
Nathan Cutler
498578dba8 etc/sysconfig/ceph: add CEPH_AUTO_RESTART_ON_UPGRADE
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 15:18:46 +02:00
Nathan Cutler
f8895fc70b ceph.spec.in: Standardize systemd preun and postun scripts
Currently, the main ceph package and the ceph-radosgw behave
differently on upgrade. This commit unifies their behavior
to the following:

On package removal, disable and stop all related systemd units.

On package upgrade, do nothing unless there is a file /etc/sysconfig/ceph
containing a parameter CEPH_AUTO_RESTART_ON_UPGRADE. If parameter is set
to "yes", restart the systemd units iff they are running.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 15:18:25 +02:00
Nathan Cutler
404ffab739 ceph.spec.in: fix for out-of-memory errors in OBS
Add "--param ggc-min-expand=20 --param ggc-min-heapsize=32768"
to RPM_OPT_FLAGS, ensuring gcc does not add debug symbols and is
more aggressive about garbage collection.

Thanks to Berthold Gunreben for debugging this issue.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 14:40:41 +02:00
Nathan Cutler
db4727f943 ceph.spec.in: Use _smp_mflags instead of _NPROCESSORS_ONLN
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 14:40:41 +02:00
Nathan Cutler
3217803700 Revert "install-deps.sh: use %bcond_with selinux on SLE/openSUSE"
This reverts commit 1df2cc2bf6.
2015-10-06 14:40:41 +02:00
Nathan Cutler
5dd93d7de1 ceph.spec.in: selinux by default on RHEL/Fedora, non-default on SUSE
Surround it with an appropriate conditional.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 14:40:41 +02:00
Nathan Cutler
9e226a8081 ceph.spec.in: use %fillup_only macro in SLE/openSUSE
SUSE does not allow /etc/sysconfig/ceph to be owned by the ceph
package.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 14:40:41 +02:00
Nathan Cutler
2c6977cd5f ceph.spec.in: distro-conditional groupadd and useradd
The -o option to groupadd/useradd is not recognized in SLE12. For
SLE/openSUSE, follow the openSUSE packaging guidelines.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 14:40:40 +02:00
Nathan Cutler
0dd9313628 ceph.spec.in: move systemd-tmpfiles stuff to ceph-common
Since the ceph user and group are created in the ceph-common
%pre scriptlet, the systemd-tmpfiles --create command needs
to run in that package.

tracker.ceph.com/issues/13346 Fixes: #13346

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 14:40:38 +02:00
Nathan Cutler
d58d885dac ceph.spec.in: remove SUSE-specific curses hack
Unclear what this was supposed to fix.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 14:33:57 +02:00
Nathan Cutler
bf9ca1eb10 ceph.spec.in: lttng in SLES12 only
Over in the SUSE sector, we are trying to enable the SLE_12 and openSUSE_13.2
build targets. The lttng/babeltrace stuff is currently available only in
SLE_12.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 12:34:07 +02:00
Nathan Cutler
50567b4964 ceph.spec.in: drop %insserv_prereq (obsoleted by systemd)
The %post, etc. scriptlets are no longer calling %insserv, et al.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 12:34:07 +02:00
Nathan Cutler
c84722a9a6 ceph.spec.in: fix boost-random build dependency for SLE/openSUSE
In Fedora, RHEL and CentOS there is a package called boost-random.
In SLE/openSUSE, there is no such package.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 12:33:26 +02:00
Sage Weil
d0ecb0abbc doc/release-notes: initial v9.1.0 notes
Signed-off-by: Sage Weil <sage@redhat.com>
2015-10-05 21:57:40 -04:00
Sage Weil
3570ec612a Merge pull request #6110 from ceph/wip-13239-infernalis
rgw: set default value for env->get() call

Reviewed-by: Sage Weil <sage@redhat.com>
2015-10-05 17:32:00 -04:00
Sage Weil
42a2c340e1 Merge pull request #6142 from ceph/wip-13061
ceph.spec.in: Do not always restart the daemons on upgrades/removal

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-10-05 16:12:57 -04:00
Sage Weil
e389fe12d7 Merge pull request #6105 from liewegas/wip-13262
mon: ignore messages from disconnected clients; clean up session checks

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2015-10-05 16:09:03 -04:00
Sage Weil
678384a17c Merge pull request #6176 from liewegas/wip-13283
osdc/Objecter: send FULL_TRY and FULL_FORCE ops despite full flag

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-10-05 14:51:43 -04:00
Sage Weil
a6a6923cc6 osdc/Objecter: send FULL_TRY and FULL_FORCE ops despite full flag
If a request has the FULL_TRY or FULL_FORCE flag, send it despite a full
pool or cluster.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-10-05 09:17:25 -04:00
Sage Weil
8201f0eceb mon: allow ping through despite synch/quorum status, with session
Attach sessions to ping messages, too.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-10-05 08:37:50 -04:00
Sage Weil
5008da2a3d mon: drop ops on closed sessions early
We will throw it out in dispatch_op() anyway.  Remove the ancient (~2009)
reuse_caps logic too, which doesn't make any sense nowadays anyway.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-10-05 08:37:49 -04:00
Sage Weil
17e55b9546 mon: clean up _ms_dispatch
Lots of cruft here.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-10-05 08:37:49 -04:00
Sage Weil
12bbc08fb6 mon: all MonOpRequests have an attached Session
...except in dispatch, where we initially set it up.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-10-05 08:37:49 -04:00
Sage Weil
6cf34a3e5d mon: drop any ops from closed sessions in dispatch_op
If we've closed the session we shouldn't waste our time on this op.

Fixes: #13262 (we should not add a subscription to a disconnected session)
Signed-off-by: Sage Weil <sage@redhat.com>
2015-10-05 08:37:49 -04:00
Sage Weil
a87582684a mon: always set up session; move waitlist logic
Unconditionally attach a Session, so that when we push an op back through
dispatch_op it isn't in a weird broken state.

Move the waitinglist check to the bottom.  Use s->global_id == 0 to tell
whether a client has authenticated, and zap sessions based on that.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-10-05 08:37:49 -04:00
Sage Weil
362b18a532 mon: fix msg leak in resend_routed_requests
MForward takes its own ref so we can drop ours.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-10-03 12:40:53 -04:00
Haomai Wang
c9dad52c96 Mon: Fix decoded message leak when this monitor is leader
Fix #13109
Signed-off-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-10-03 12:40:40 -04:00
Sage Weil
16554eb45e Merge pull request #6139 from liewegas/wip-13283
librados: add FULL_TRY flag; EDQUOT != ENOSPC

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-10-03 08:50:25 -04:00
Sage Weil
3ed25c1f79 librados: document new flag
Signed-off-by: Sage Weil <sage@redhat.com>
2015-10-02 17:47:54 -04:00
Yehuda Sadeh
79d8f895a5 Merge pull request #6169 from rzarzynski/wip-13326
rgw: improve handling of already removed buckets in object expirer.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-10-02 14:17:42 -07:00
Ken Dreyer
3139ab4de0 Merge pull request #6168 from SUSE/wip-13333-infernalis
ceph.spec.in: correctly declare systemd dependency for SLE/openSUSE

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-10-02 13:30:44 -06:00
Nathan Cutler
929e5d04a0 ceph.spec.in: correctly declare systemd dependency for SLE/openSUSE
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 7b1882f875)
2015-10-02 21:24:09 +02:00
Sage Weil
8d8fcee427 osd/ReplicatedPG: exempt MDS from the failsafe check, too
This mimics the prior behavior.  We probably want to change this at some
point!

Signed-off-by: Sage Weil <sage@redhat.com>
2015-10-02 14:12:22 -04:00
Radoslaw Zarzynski
81c23745c1 rgw: improve handling of already removed buckets in object expirer.
Fixes: #13326
Backport: infernalis
Signed-off-by: Radoslaw Zarzynski <rzarzynski@github.com>
2015-10-02 18:20:11 +02:00
Sage Weil
08c15821ec Merge pull request #6096 from liewegas/wip-13260
osd/ReplicatedPG: preserve (some) flags when proxying reads

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-10-02 08:47:33 -04:00
Sage Weil
4936f5916c Merge pull request #6136 from liewegas/wip-13114
osd/librados: fix notify completion race

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-10-02 08:38:39 -04:00
Boris Ranto
b9159521f4 ceph.spec.in: Do not always restart the daemons on removal
There is no need to restart the daemons when removing ceph-selinux
package if SELinux is not enabled.

Fixes: #13061
Signed-off-by: Boris Ranto <branto@redhat.com>
2015-10-02 12:19:14 +02:00
Boris Ranto
c95c14ba25 ceph.spec.in: Do not always restart the daemons on upgrades
This patch minimizes the amount of daemon stop/start procedures when
upgrading ceph-selinux package. With this patch, the daemons get
restarted only if SELinux is enabled and the SELinux policy version
changed in the meantime.

Fixes: #13061
Signed-off-by: Boris Ranto <branto@redhat.com>
2015-10-02 12:19:07 +02:00