Commit Graph

45012 Commits

Author SHA1 Message Date
Samuel Just
691d5535ea Merge pull request #6193 from athanatos/wip-13240
ReplicatedPG::maybe_handle_cache: do not promote before checking full

Reviewed-by: Sage Weil <sage@redhat.com>
2015-10-09 16:16:27 -07:00
Sage Weil
1e017ef63d Merge pull request #6190 from SUSE/wip-drop-my-conf-opt
ceph.spec.in: drop MY_CONF_OPTS

Reviewed-by: Ken Dreyer, <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
2015-10-09 16:34:25 -04:00
Sage Weil
4b7cf9ce83 Merge pull request #6183 from ceph/wip-fix-selinux-man-page
Fix selinux man page

Reviewed-by: Nathan Cutler <ncutler@suse.com>
2015-10-09 16:33:48 -04:00
Sage Weil
093af4277b Merge pull request #6191 from SUSE/wip-concentrate-buildrequires
ceph.spec.in: move BuildRequires out of subpackages

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-10-09 16:33:14 -04:00
Sage Weil
031b41b5d9 Merge pull request #6184 from dillaman/wip-13372-infernalis
librbd: invalidate object map on error even w/o holding lock

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-10-09 16:31:43 -04:00
Radoslaw Zarzynski
5b9c326106 rgw: fix wrong etag calculation during POST on S3 bucket.
Fixes: #11241
Backport: infernalis, hammer, firefly
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit 742906ab5e)
2015-10-09 13:34:05 -07:00
Haomai Wang
cbf36ad0df LibRBD: Adjust correct op latency scope
Op latency need to cover from queuing to finishing op.

Signed-off-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Jason Dillaman <jdillaman@redhat.com>
2015-10-09 16:28:12 -04:00
Jason Dillaman
4fdc703e84 librados_test_stub: prevent interleaving of operations
It was possible for unrelated ops to interleave within a different
transaction for a given object.

Fixes: #13313
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-10-09 16:26:10 -04:00
Casey Bodley
45c8a928a9 Merge pull request #6044 from ceph/wip-12958
rgw: orphan tool shouldn't clean up head objects

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2015-10-09 12:32:51 -04:00
Yehuda Sadeh
030f697d19 rgw: orphan tool shouldn't clean up head objects
Fixes: #12958

Head objects are mutable, so removing them can race with object removal
and a later recreation, so we might end up cleaning them up when we don't
need to.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-10-09 12:31:48 -04:00
Kefu Chai
010836d059 Merge pull request #6187 from SUSE/wip-13317-infernalis
doc: remove mention of --lazy-remove from radosgw-admin manpage

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-10-09 15:48:49 +08:00
Kefu Chai
84faaa42c6 Merge pull request #6211 from SUSE/wip-dead-bool
CephxServiceHandler.cc: fix get_auth conditional

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-10-09 14:47:40 +08:00
Nathan Cutler
7250db62cb CephxServiceHandler.cc: fix get_auth conditional
The KeyServer class has a public method get_auth() that returns a boolean
value. This value is being checked here - fix the conditional so it triggers
when get_auth() returns false.

http://tracker.ceph.com/issues/9756 References: #9756

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-09 06:28:34 +02:00
Josh Durgin
61d24d9d96 Merge pull request #6194 from dillaman/wip-13220-infernalis
rbd-replay-prep and rbd-replay improvements

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-10-08 16:20:05 -04:00
Samuel Just
1a2689f8d7 ReplicatedPG::maybe_handle_cache: do not promote before checking full
Otherwise, ops with need_promote() can order past ops without it
causing an rgw write sequence like:

writefull 0~0
writefull 0~512kb
write 512kb~512kb

to reorder to

writefull 0~0 -- delayed: full
writefull 0~512kb -- delayed: full
write 512kb~512kb -- promote and execute
writefull 0~0 -- execute
writefull 0~512kb -- execute

Fixes: 13240
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-10-08 11:23:13 -07:00
Jason Dillaman
e0d8cb1283 tests: removed obsolete rbd_replay test cases
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-10-08 13:28:43 -04:00
Jason Dillaman
c2a83d0b51 ceph-dencoder: new rbd_replay trace file types
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-10-08 13:27:01 -04:00
Jason Dillaman
3ecdae8388 rbd-replay: added version control to trace output file
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-10-08 13:21:29 -04:00
John Spray
10bd1cac20 Merge pull request #6116 from jcsp/wip-cephfs-direntry
pybind/cephfs: fix DirEntry helpers

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-10-08 12:08:31 +01:00
Sage Weil
6b94b41401 Merge pull request #6188 from liewegas/wip-13395
os/FileStore: kludge sloppy hammer temp objects into temp collection

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
2015-10-08 00:07:43 -04:00
Jason Dillaman
646e50a771 rbd-replay-prep: added --verbose command line option
This new command-line will dump all the processed events as they
are extracted from the trace file.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-10-07 16:51:06 -04:00
Jason Dillaman
98f513a113 rbd-replay-prep: stream events to the prep file
Avoid building the entire prep event history in memory before
attempting to write the prepped trace file.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-10-07 16:34:56 -04:00
Jason Dillaman
65fb1b86cb rbd-replay-prep: simplify IO dependency calculation
Only track read-after-write and write-after-write IO dependencies
via the associated write completions.  All IO events after a write
completion are considered to be dependent and can be pruned down
to at most the number of concurrent IOs.  This reduces the prep
time from a simple 'rbd bench-write' from over 4 hrs down to seconds.

Fixes: #13378, #13384
Backport: hammer

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-10-07 16:34:55 -04:00
Jason Dillaman
4f436e1080 rbd-replay: improve error messages
Fixes: #13221
Backport: hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-10-07 15:41:23 -04:00
Jason Dillaman
b5b4a9dd6b rbd-replay-prep: support new read/write APIs
Added support for read2, write2, aio_read2, and aio_write2 APIs.

Fixes: 13325
Backport: hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-10-07 15:41:23 -04:00
Jason Dillaman
a1e99f06a7 rbd-replay-prep: avoid using assert statements on user inputs
Fixes: #13220
Backport: hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-10-07 15:41:23 -04:00
Gregory Farnum
1a421975bc Merge pull request #6170 from jcsp/wip-spurious-warning
mds: avoid emitting cap warnings before evicting session

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-10-07 10:52:04 -07:00
Gregory Farnum
d73c0998bb Merge pull request #6128 from jcsp/wip-snapserver-crash
mds: fix SnapServer crash on deleted pool

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-10-07 10:51:39 -07:00
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
e049de34c8 os/FileStore: kludge sloppy hammer temp objects into temp collection
When we are running with a mixed hammer cluster, hammer primaries
will generate temp object names that are sloppy.  Make sure we still
put them into the temp collection.

Note that this isn't a problem on write because the primary (hammer)
OSD generated the transaction and explicitly specified a temp
collection; it's only transactions we do on our own with the sloppy
temp ghobject_t that trip over this.

Fixes: #13395
Signed-off-by: Sage Weil <sage@redhat.com>
2015-10-07 11:49:25 -04:00
Nathan Cutler
5a11d7618e ceph.spec.in: move python-sphinx BuildRequires to the right section
These belong in the section for distro-conditional dependencies.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-07 17:47:14 +02:00
Nathan Cutler
96aabe7610 ceph.spec.in: move BuildRequires out of subpackages
Since the main package and all the subpackages are built in the
same environment, concentrate all the BuildRequires in the main
package.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-07 17:47:14 +02:00
Nathan Cutler
d258bf5852 ceph.spec.in: drop MY_CONF_OPTS
http://tracker.ceph.com/issues/13402 Fixes: #13402

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-07 17:32:27 +02: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
Nathan Cutler
468c2dd6b1 doc: remove mention of --lazy-remove from radosgw-admin manpage
"The --lazy-remove flag has been removed over 3 years ago. Docs need to be
updated."

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 21:44:09 +02: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
Jason Dillaman
e675400df7 librbd: invalidate object map on error even w/o holding lock
If there is a deep bug that prevents the object map from owning
the lock before objects are updated, flag the object map as invalid
regardless.

Fixes: #13372
Backport: hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-10-06 12:31:59 -04:00
Boris Ranto
bc48ef0fef selinux: Fix man page location
The SELinux man page was previously located in two places and the man
page that was supposed to be updated when rgw selinux changes were
proposed did not get updated properly. Fixing this by moving
selinux/ceph_selinux.8 to man/ceph_selinux.8. Also, populate EXTRA_DIST
with ceph_selinux.8.

Signed-off-by: Boris Ranto <branto@redhat.com>
2015-10-06 18:08:15 +02:00
Nathan Cutler
378d56d1e2 man/Makefile-server.am: conditionalize make ceph_selinux manpage
http://tracker.ceph.com/issues/13353 Fixes: #13353

Modified-by: Boris Ranto <branto@redhat.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 18:08:15 +02: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