Commit Graph

57035 Commits

Author SHA1 Message Date
Haomai Wang
640d61732d Merge pull request #9869 from yuyuyu101/wip-kqueue
msg/async/kqueue: avoid remove nonexist kqueue event

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
2016-08-26 11:31:59 +08:00
Kefu Chai
4c514e3686 Merge pull request #10879 from dmick/wip-jerasure-aarch64
jerasure: include generic objects in neon jerasure lib (like sse3/4)

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-08-26 10:52:51 +08:00
Kefu Chai
577f027ba8 Merge pull request #9943 from ceph/wip-ceph-disk-systemd
ceph-disk: do not activate device that is not ready

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-08-26 09:36:53 +08:00
Kefu Chai
3c6d48b42c Merge pull request #10828 from michelmno/perf_local_flags
cmake: use PERF_LOCAL_FLAGS only if defined

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-08-26 09:23:25 +08:00
Ken Dreyer
b0f9aaf852 Merge pull request #9757 from SUSE/wip-16353
rpm: drop obsolete libs-compat and python-ceph-compat metapackages

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2016-08-25 15:05:48 -06:00
Sage Weil
41ddc8be35 Merge pull request #10730 from SUSE/wip-release-notes-draft
release-notes.rst: draft 0.94.8 release notes

Reviewed-by: Sage Weil <sage@redhat.com>
2016-08-25 15:23:23 -05:00
Ken Dreyer
0f001697b1 Merge pull request #10805 from SUSE/wip-dont-package-__pycache__
ceph.spec.in: don't try to package __pycache__ for SUSE

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Dirk Mueller <dmueller@suse.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2016-08-25 14:04:54 -06:00
Dan Mick
09f041c7c9 jerasure: include generic objects in neon jerasure lib (like sse3/4)
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2016-08-25 11:35:17 -07:00
Kefu Chai
16f4baabe7 Merge pull request #10577 from wjwithagen/wip-wjw-test-rados-striper
Rados-stripper: Flexible string matching for not found attributes

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-08-25 23:30:21 +08:00
Mykola Golub
ae81907146 Merge pull request #10770 from dillaman/wip-16773
librbd: interlock image refresh and exclusive lock operations

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-08-25 13:49:10 +03:00
Orit Wasserman
c19ecb05e4 Merge pull request #10831 from cbodley/wip-17051
rgw: delete region map after upgrade to zonegroup map
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-08-25 09:55:53 +02:00
Kefu Chai
cd28cf294f Merge pull request #10824 from dachary/wip-17100-ceph-disk
tests: populate /dev/disk/by-partuuid for scsi_debug

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-08-24 22:46:05 +08:00
Casey Bodley
25415bf33a Merge pull request #10836 from weiqiaomiao/wqm-wip-period-update
rgw: fix period update --commit return error

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-08-24 08:58:12 -04:00
Alfredo Deza
7d7f66207d Merge pull request #10829 from liewegas/wip-readme-make-dist
README.md: replace package build instructions with tarball instructions
Reviewed-by: Alfredo Deza <adeza@redhat.com>
2016-08-24 07:48:51 -04:00
Jason Dillaman
84bee772c8 Merge pull request #10576 from wjwithagen/wip-wjw-noise-lockdep
lockdep: verbose even if no logging is set

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-08-24 07:35:13 -04:00
Willem Jan Withagen
0dde48946d rados-striper.sh: Use expect_failure and conditional stringmatching
- Linux and FreeBSD do not have the same error strings

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2016-08-24 13:18:45 +02:00
Kefu Chai
586cfc998b Merge pull request #10840 from david-z/wip-fix-manpage
doc: fix wrong osdkeepalive name in mount.ceph manpage

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-08-24 18:51:44 +08:00
Zhi Zhang
55385bd137 doc: fix wrong osdkeepalive name in mount.ceph manpage
Signed-off-by: Zhi Zhang <zhangz.david@outlook.com>
2016-08-24 17:59:15 +08:00
Tim Serong
be39d6dc71 ceph.spec.in: don't try to package __pycache__ for SUSE
When building on openSUSE Tumbleweed, nothing seems to create
the various __pycache__ directories (so the build fails because
those files don't exist), and in any case they should be
created automatically at runtime, so shouldn't need to be
packaged.  However, the Fedora packaging guidelines suggest
including __pycache__, so I've used a %suse_version guard here.

Fixes: http://tracker.ceph.com/issues/17106
Signed-off-by: Tim Serong <tserong@suse.com>
2016-08-24 19:09:14 +10:00
Loic Dachary
7cbf1f0a5e tests: populate /dev/disk/by-partuuid for scsi_debug
The scsi_debug SCSI devices do not have a symlink in /dev/disk/by-partuuid
because they are filtered out by 60-persistent-storage.rules. That was
worked around by 60-ceph-partuuid-workaround-rules which has been
removed by 9f76b9ff31.

Add create rules targetting this specific case, only for tests since the
problem does not show in real use cases.

Fixes: http://tracker.ceph.com/issues/17100

Signed-off-by: Loic Dachary <loic@dachary.org>
2016-08-24 10:10:30 +02:00
Michel Normand
afcec7038c cmake: use PERF_LOCAL_FLAGS only if defined
in src/test/CMakeLists.txt
to avoid build error for ppc64/ppc64le archi

Fixes: http://tracker.ceph.com/issues/17104
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
2016-08-24 08:54:42 +02:00
Kefu Chai
9586040a1d Merge pull request #10811 from jimifm/master
osd/ReplicatedPG: remove unused param "op" from generate_subop()

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-08-24 09:51:44 +08:00
weiqiaomiao
fcedda6e5d rgw: fix period update --commit return error
period commit return error when the current period has a zonegroup which doesn't have a master zone

Fixes: http://tracker.ceph.com/issues/17110
Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
2016-08-24 09:38:03 +08:00
Loic Dachary
4b09ca689f Merge pull request #10830 from SUSE/wip-fix-singleton-example
doc: fix singleton example in Developer Guide

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-08-24 01:26:49 +02:00
Casey Bodley
215cd6f6ff rgw: delete region map after upgrade to zonegroup map
convert_regionmap() reads the region map and uses it to initialize the
zonegroup map.  but it doesn't remove the region_map afterwards, so
radosgw (and some radosgw-admin commands) will keep doing this on
startup, overwriting any changes made to the period/zonegroup map

Fixes: http://tracker.ceph.com/issues/17051

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-08-23 15:10:46 -04:00
Nathan Cutler
75e5a5d09c doc: fix singleton example in Developer Guide
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-08-23 20:53:36 +02:00
Sage Weil
537cbb380b Merge pull request #10817 from stiopaa1/os_memstore_movePageSetObject
os/Memstore: move PageSetObject class to .cc file

Reviewed-by: Sage Weil <sage@redhat.com>
2016-08-23 13:27:43 -05:00
Sage Weil
ddb8125500 Merge pull request #10803 from stiopaa1/os_memstore_moveOmapIteratorImplClassToCC
os/MemStore: move OmapIteratorImpl to cc file

Reviewed-by: Sage Weil <sage@redhat.com>
2016-08-23 13:27:18 -05:00
Sage Weil
b7c7941b51 Merge pull request #10799 from stiopaa1/os_fusestore_removeUnneededHeader
os/FuseStore: remove unneeded header file

Reviewed-by: Sage Weil <sage@redhat.com>
2016-08-23 13:26:51 -05:00
Sage Weil
08f4ce0671 Merge pull request #10801 from stiopaa1/os_memstore_addOverride
os/Memstore.h: add override to virtual functions

Reviewed-by: Sage Weil <sage@redhat.com>
2016-08-23 13:26:31 -05:00
Sage Weil
428b3b8d67 README.md: replace package build instructions with tarball instructions
Signed-off-by: Sage Weil <sage@redhat.com>
2016-08-23 14:22:21 -04:00
Jason Dillaman
5156b438d5 librbd: remove unused refresh request logic
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-08-23 12:23:07 -04:00
Jason Dillaman
583ac91872 librbd: interlock image refresh and lock operations
Fixes: http://tracker.ceph.com/issues/16773
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-08-23 12:23:07 -04:00
Jason Dillaman
a5b8c9c1d8 librbd: image state machine now has hooks for lock requests
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-08-23 12:23:07 -04:00
Jason Dillaman
d0d97fcca2 librbd: integrate asynchronous image rewatch state machine
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-08-23 12:23:07 -04:00
Jason Dillaman
32180aaf42 librbd: helper state machine for asynchronous watch recovery
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-08-23 12:23:07 -04:00
Jason Dillaman
66c605573f librbd: exclusive lock now supports reacquiring a lost lock
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-08-23 12:23:07 -04:00
Jason Dillaman
aa53f74ad2 librbd: store exclusive lock cookie instead of recalculating
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-08-23 12:23:07 -04:00
Jason Dillaman
d523df8daf librbd: helper state machine to update lock cookie
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-08-23 12:23:07 -04:00
Jason Dillaman
377f57652f cls_lock: support updating the lock cookie without releasing the lock
Fixes: http://tracker.ceph.com/issues/17015
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-08-23 12:23:07 -04:00
Yehuda Sadeh
d8a02b9f9a Merge pull request #10743 from cbodley/wip-rgw-meta-sync-assert
rgw multisite: fix for assertion in RGWMetaSyncCR

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-08-23 08:09:27 -07:00
Yehuda Sadeh
ee220ab039 Merge pull request #10032 from cbodley/wip-rgw-cr-deadlock
rgw: add deadlock detection to RGWCoroutinesManager::run()

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-08-23 08:03:01 -07:00
Kefu Chai
b403cad100 Merge pull request #10821 from atheism/arm-read-improve
arch/arm.c: remove unnecessary variable read for simplicity

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-08-23 16:09:38 +08:00
Nathan Cutler
ddae82bcd4 rpm: do not unnecessarily spawn shells for scriptlets
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-08-23 08:44:40 +02:00
Nathan Cutler
231b7bad33 ceph.spec.in: drop trouble-making divider comments
We have some %post scriptlets that fire up a shell just to execute a single
command like this:

%postun -n librados2
/sbin/ldconfig

Normally, it would be possible to optimize these as:

%postun -n librados2 -p /sbin/ldconfig

Except that, due to an RPM bug, there must not be *any* content (not even comments)
between the %postun and the next section.

See https://bugzilla.redhat.com/show_bug.cgi?id=1003962#c0 for details.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-08-23 08:44:35 +02:00
Nathan Cutler
644650f59d rpm: drop obsolete libs-compat metapackage
Fixes: http://tracker.ceph.com/issues/16353
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-08-23 08:43:44 +02:00
Kefu Chai
2202bcc71b Merge pull request #10819 from cbodley/wip-yasm-spam
yasm-wrapper: dont echo the yasm command line

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-08-23 12:27:16 +08:00
zhangweibing
ed5f25f3f8 arch/arm.c: remove unnecessary variable read for simplicity
Signed-off-by: Weibing Zhang <zhangweibing@unitedstack.com>
2016-08-23 12:12:38 +08:00
Casey Bodley
f7f58a61aa yasm-wrapper: dont echo the yasm command line
commented out the echos because they're noisy. if anyone needs to debug
the wrapper in the future, they can uncomment

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-08-22 19:31:58 -04:00
Yuri Weinstein
bce9b9336e Merge pull request #10572 from xiexingguo/xxg-wip-osd-2016-08-04
osd: miscellaneous fixes

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-08-22 13:29:59 -07:00