]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/log
ceph-ci.git
9 years agolibcephfs: return the change_attr in the statx.stx_version field
Jeff Layton [Mon, 29 Aug 2016 11:16:40 +0000 (07:16 -0400)]
libcephfs: return the change_attr in the statx.stx_version field

Signed-off-by: Jeff Layton <jlayton@redhat.com>
9 years agomds/client: bump the change_attr at the appropriate time for files
Jeff Layton [Mon, 29 Aug 2016 11:16:40 +0000 (07:16 -0400)]
mds/client: bump the change_attr at the appropriate time for files

The semantics for a change_attr are that it should be incremented
whenever there is a change to the ctime in the inode. Add those
increments for the simple case of regular files. Directories however can
be fragmented so we'll need to do something more elaborate there.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
9 years agomds: ensure that change_attr reflects metadata changes on clients that hold CAP_FILE_EXCL
Jeff Layton [Mon, 29 Aug 2016 14:33:10 +0000 (10:33 -0400)]
mds: ensure that change_attr reflects metadata changes on clients that hold CAP_FILE_EXCL

Suppose we have two clients. client1 holds FILE_EXCL cap and client2
holds AUTH_EXCL.  Both have the change_attr at the same value (call it
1).  client1 does 2 writes and its change_attr goes to 3. The client1
then queries for the change_attr and gets back 3 from the cache. The MDS
then recalls FILE_EXCL from client1 and now the MDS and client1 have the
same change_attr (3).

client2 then does a chmod on the file, and its change_attr goes to 2.
client1 then does a statx with STX_VERSION|STX_MODE. The MDS recalls the
AUTH_EXCL cap from client2, the change_attr in the MClientCaps is less
than the one in the MDS inode, so it gets discarded. client1 then sees
a new mode but the change_attr value has not changed, which violates the
rules.

Fix this with an extra increment of the MDS copy of the change_attr when
the caps being returned are dirty, and they don't contain exclusive write
caps.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
9 years agomds/client: keep change_attr in Inode, CapSnap and MClientCaps
Jeff Layton [Mon, 29 Aug 2016 11:16:40 +0000 (07:16 -0400)]
mds/client: keep change_attr in Inode, CapSnap and MClientCaps

...and pass it around appropriately.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
9 years agomds: pass change_attr in InodeStat MClientReply, if feature is present
Jeff Layton [Mon, 29 Aug 2016 11:16:39 +0000 (07:16 -0400)]
mds: pass change_attr in InodeStat MClientReply, if feature is present

Signed-off-by: Jeff Layton <jlayton@redhat.com>
9 years agoinclude/ceph_features: add FS_CHANGE_ATTR feature
Jeff Layton [Mon, 29 Aug 2016 11:16:39 +0000 (07:16 -0400)]
include/ceph_features: add FS_CHANGE_ATTR feature

...that is mapped to BTIME feature.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
9 years agomds/MDCache: set change_attr to 0 on system_inodes
Jeff Layton [Mon, 29 Aug 2016 11:16:39 +0000 (07:16 -0400)]
mds/MDCache: set change_attr to 0 on system_inodes

Signed-off-by: Jeff Layton <jlayton@redhat.com>
9 years agomds/Server: set change_attr to 0 on creation
Jeff Layton [Mon, 29 Aug 2016 11:16:39 +0000 (07:16 -0400)]
mds/Server: set change_attr to 0 on creation

Signed-off-by: Jeff Layton <jlayton@redhat.com>
9 years agomds/mdstypes: add change attribute to inode
Jeff Layton [Mon, 29 Aug 2016 11:16:39 +0000 (07:16 -0400)]
mds/mdstypes: add change attribute to inode

Signed-off-by: Jeff Layton <jlayton@redhat.com>
9 years agomds/client: add btime to CapSnap and MClientCaps
Jeff Layton [Mon, 29 Aug 2016 11:16:39 +0000 (07:16 -0400)]
mds/client: add btime to CapSnap and MClientCaps

Currently we don't have a mechanism to set the btime, but we will need
that eventually. If we want to allow the client to cache that change, we
need to be able to pass it back and forth between client and server.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
9 years agolibcephfs: add a test for "lazy" statx
Jeff Layton [Mon, 29 Aug 2016 11:16:39 +0000 (07:16 -0400)]
libcephfs: add a test for "lazy" statx

Create 2 clients. Create a file in client1, and do a lookup of it in
client2, and then ll_getattrx it from client2. chmod the file from
client1, ll_getattrx it client2 (this time with AT_NO_ATTR_SYNC) and
ensure that the ctime change is not seen.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
9 years agolibcephfs: add a ceph_ll_getattrx and ceph_statx
Jeff Layton [Mon, 29 Aug 2016 11:16:38 +0000 (07:16 -0400)]
libcephfs: add a ceph_ll_getattrx and ceph_statx

New interfaces for fetching extended (and selective) stat information.
Additionally, applications can specify AT_NO_ATTR_SYNC in the flags to
indicate that they want to do a "lazy" statx that just hands out the
inode info from the cache, or AT_SYMLINK_NOFOLLOW to avoid following
symlinks when walking the path.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
9 years agoclient: move the device bitshift handling macros to Client.h
Jeff Layton [Mon, 29 Aug 2016 11:16:38 +0000 (07:16 -0400)]
client: move the device bitshift handling macros to Client.h

We'll need them in Client.cc now in addition to FUSE specific code.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
9 years agoceph: break up ll_getattr into two functions
Jeff Layton [Mon, 29 Aug 2016 11:16:38 +0000 (07:16 -0400)]
ceph: break up ll_getattr into two functions

...in preparation for adding a ll_getattrx.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
9 years agoclient: keep btime in Inode and InodeStat
Sage Weil [Mon, 29 Aug 2016 11:16:38 +0000 (07:16 -0400)]
client: keep btime in Inode and InodeStat

Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
9 years agomds: pass btime in InodeStat MClientReply, if feature is present
Sage Weil [Mon, 29 Aug 2016 11:16:38 +0000 (07:16 -0400)]
mds: pass btime in InodeStat MClientReply, if feature is present

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoinclude/ceph_features: add FS_BTIME features
Sage Weil [Mon, 29 Aug 2016 11:16:38 +0000 (07:16 -0400)]
include/ceph_features: add FS_BTIME features

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomds/MDCache: set btime on system inodes
Sage Weil [Mon, 29 Aug 2016 11:16:38 +0000 (07:16 -0400)]
mds/MDCache: set btime on system inodes

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomds/Server: set btime=ctime on creation
Sage Weil [Mon, 29 Aug 2016 11:16:37 +0000 (07:16 -0400)]
mds/Server: set btime=ctime on creation

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomds/mdstypes: add btime to inode
Sage Weil [Mon, 29 Aug 2016 11:16:37 +0000 (07:16 -0400)]
mds/mdstypes: add btime to inode

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoclient: pass a mask parameter to path_walk
Jeff Layton [Mon, 29 Aug 2016 11:16:37 +0000 (07:16 -0400)]
client: pass a mask parameter to path_walk

ll_walk expects to get a set of attributes out of a path_walk. Pass a
caps mask parameter into path_walk, and then apply it when we reach the
last component of the path.

This may prevent us from having to further iteract with the server after
the pathwalk, in some cases. If we know that we're going to need certain
caps to do the actual operation we can request them during the lookup
and may have all that we need by the time we go to do the real request.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
9 years agoMerge pull request #9301 from objoo/YD-mailmap-updates-MAY3
Loic Dachary [Mon, 29 Aug 2016 08:59:52 +0000 (10:59 +0200)]
Merge pull request #9301 from objoo/YD-mailmap-updates-MAY3

mailmap updates for upcoming 11.0.0

Reviewed-by: Loic Dachary <loic@dachary.org>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agoMerge pull request #10878 from stiopaa1/mds_snaprealm_addconstToMem
Gregory Farnum [Mon, 29 Aug 2016 04:24:03 +0000 (21:24 -0700)]
Merge pull request #10878 from stiopaa1/mds_snaprealm_addconstToMem

mds/SnapRealm.h: add const to member functions

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #10901 from stiopaa1/mds_mdcache_accessspecifierU
Gregory Farnum [Mon, 29 Aug 2016 04:17:51 +0000 (21:17 -0700)]
Merge pull request #10901 from stiopaa1/mds_mdcache_accessspecifierU

mds/MDCache.h: remove unneeded access specifier

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #10894 from smithfarm/wip-suse-build-pycache
Nathan Cutler [Sun, 28 Aug 2016 11:43:07 +0000 (13:43 +0200)]
Merge pull request #10894 from smithfarm/wip-suse-build-pycache

build/ops: force Python 3 packages to build in SUSE

Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
9 years agoMerge pull request #10903 from SUSE/wip-release-notes-correct-correction
Loic Dachary [Sun, 28 Aug 2016 11:34:14 +0000 (13:34 +0200)]
Merge pull request #10903 from SUSE/wip-release-notes-correct-correction

doc: fix some nits in release notes and releases table

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agodoc: add 11.0.0 to releases table
Nathan Cutler [Sun, 28 Aug 2016 07:42:42 +0000 (09:42 +0200)]
doc: add 11.0.0 to releases table

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agodoc: fix two broken links in releases.rst
Nathan Cutler [Sun, 28 Aug 2016 07:39:22 +0000 (09:39 +0200)]
doc: fix two broken links in releases.rst

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agodoc: release-notes.rst: move misplaced line
Nathan Cutler [Sun, 28 Aug 2016 07:22:23 +0000 (09:22 +0200)]
doc: release-notes.rst: move misplaced line

46264a3b6cb7f490680c79bf0957c36aeaea5f6c added the missing line to the wrong
section. This commit moves it to the right section (v0.94.8).

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #10899 from SUSE/wip-retirement
Loic Dachary [Sat, 27 Aug 2016 18:38:18 +0000 (20:38 +0200)]
Merge pull request #10899 from SUSE/wip-retirement

doc: do not list all major versions in get-packages.rst

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #10900 from SUSE/wip-hammer-release-notes-correction
Loic Dachary [Sat, 27 Aug 2016 18:37:13 +0000 (20:37 +0200)]
Merge pull request #10900 from SUSE/wip-hammer-release-notes-correction

doc: add missing PR to hammer 0.94.8 release notes

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agomds/MDCache.h: remove unneeded access specifier
Michal Jarzabek [Sat, 27 Aug 2016 18:18:07 +0000 (19:18 +0100)]
mds/MDCache.h: remove unneeded access specifier

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agodoc: add missing PR to hammer 0.94.8 release notes
Nathan Cutler [Sat, 27 Aug 2016 18:20:50 +0000 (20:20 +0200)]
doc: add missing PR to hammer 0.94.8 release notes

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agodoc: do not list all major versions in get-packages.rst
Nathan Cutler [Sat, 27 Aug 2016 18:11:04 +0000 (20:11 +0200)]
doc: do not list all major versions in get-packages.rst

The list of major versions is difficult to maintain. This commit drops it and
replaces it with a link to releases.rst plus some general language about how we
recommend that everyone keep their clusters up-to-date.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #10895 from liewegas/wip-changelog
Sage Weil [Fri, 26 Aug 2016 21:30:03 +0000 (16:30 -0500)]
Merge pull request #10895 from liewegas/wip-changelog

doc: fix/add changelog for 10.2.2, 0.94.7, 0.94.8

Reviewed-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #10844 from liewegas/wip-bluestore-fsck-leak
Loic Dachary [Fri, 26 Aug 2016 20:14:31 +0000 (22:14 +0200)]
Merge pull request #10844 from liewegas/wip-bluestore-fsck-leak

os/bluestore: fix when block device is not a multiple of the block size

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agounittest_bluefs: fix block device sizes
Sage Weil [Fri, 26 Aug 2016 18:22:30 +0000 (14:22 -0400)]
unittest_bluefs: fix block device sizes

These should be a multiple of the block size (since we are feeding
the size directly into add_block_extent).

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #10779 from cbodley/wip-17073
Yehuda Sadeh [Fri, 26 Aug 2016 18:09:10 +0000 (11:09 -0700)]
Merge pull request #10779 from cbodley/wip-17073

rgw multisite: RGWDataSyncCR fails on errors from RGWListBucketIndexesCR

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #10778 from cbodley/wip-17047
Yehuda Sadeh [Fri, 26 Aug 2016 18:07:45 +0000 (11:07 -0700)]
Merge pull request #10778 from cbodley/wip-17047

rgw multisite: RGWCoroutinesManager::run returns status of last cr

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #10742 from cbodley/wip-rgw-test-multi-gateway
Yehuda Sadeh [Fri, 26 Aug 2016 18:03:02 +0000 (11:03 -0700)]
Merge pull request #10742 from cbodley/wip-rgw-test-multi-gateway

test/rgw: add --gateways-per-zone to test_multi.py

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #10837 from ceph/wip-cmake
Kefu Chai [Fri, 26 Aug 2016 14:51:58 +0000 (22:51 +0800)]
Merge pull request #10837 from ceph/wip-cmake

cmake: do not link against unused objects or libraries

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
9 years agodoc/release-notes: fix v10.2.2 changelog link
Sage Weil [Fri, 26 Aug 2016 13:51:41 +0000 (09:51 -0400)]
doc/release-notes: fix v10.2.2 changelog link

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agodoc/releases: add v0.94.8 to timeline
Sage Weil [Fri, 26 Aug 2016 13:27:22 +0000 (09:27 -0400)]
doc/releases: add v0.94.8 to timeline

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agodoc: add v0.94.8 changelog
Sage Weil [Fri, 26 Aug 2016 13:27:14 +0000 (09:27 -0400)]
doc: add v0.94.8 changelog

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agodoc: add v0.94.7 changelog
Sage Weil [Fri, 26 Aug 2016 13:26:24 +0000 (09:26 -0400)]
doc: add v0.94.7 changelog

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agorpm: force creation of Python 3 __pycache__ on SUSE
Nathan Cutler [Fri, 26 Aug 2016 08:45:52 +0000 (10:45 +0200)]
rpm: force creation of Python 3 __pycache__ on SUSE

Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Dominique Leuenberger <dimstar@opensuse.org>
9 years agoRevert "ceph.spec.in: don't try to package __pycache__ for SUSE"
Nathan Cutler [Fri, 26 Aug 2016 12:21:59 +0000 (14:21 +0200)]
Revert "ceph.spec.in: don't try to package __pycache__ for SUSE"

This reverts commit be39d6dc71af13eb3ee0d4482012a2091d121f66.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #10547 from wjwithagen/wip-wjw-test-util
Kefu Chai [Fri, 26 Aug 2016 08:57:10 +0000 (16:57 +0800)]
Merge pull request #10547 from wjwithagen/wip-wjw-test-util

test/common/test_util.cc: FreeBSD does not have distro information

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9869 from yuyuyu101/wip-kqueue
Haomai Wang [Fri, 26 Aug 2016 03:31:59 +0000 (11:31 +0800)]
Merge pull request #9869 from yuyuyu101/wip-kqueue

msg/async/kqueue: avoid remove nonexist kqueue event

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
9 years agoMerge pull request #10879 from dmick/wip-jerasure-aarch64
Kefu Chai [Fri, 26 Aug 2016 02:52:51 +0000 (10:52 +0800)]
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>
9 years agoMerge pull request #9943 from ceph/wip-ceph-disk-systemd
Kefu Chai [Fri, 26 Aug 2016 01:36:53 +0000 (09:36 +0800)]
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>
9 years agoMerge pull request #10828 from michelmno/perf_local_flags
Kefu Chai [Fri, 26 Aug 2016 01:23:25 +0000 (09:23 +0800)]
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>
9 years agomds/SnapRealm.h: add const to member functions
Michal Jarzabek [Thu, 25 Aug 2016 21:36:09 +0000 (22:36 +0100)]
mds/SnapRealm.h: add const to member functions

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agoMerge pull request #9757 from SUSE/wip-16353
Ken Dreyer [Thu, 25 Aug 2016 21:05:45 +0000 (15:05 -0600)]
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>
9 years agoMerge pull request #10730 from SUSE/wip-release-notes-draft
Sage Weil [Thu, 25 Aug 2016 20:23:23 +0000 (15:23 -0500)]
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>
9 years agoMerge pull request #10805 from SUSE/wip-dont-package-__pycache__
Ken Dreyer [Thu, 25 Aug 2016 20:04:48 +0000 (14:04 -0600)]
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>
9 years agojerasure: include generic objects in neon jerasure lib (like sse3/4)
Dan Mick [Thu, 25 Aug 2016 05:03:44 +0000 (22:03 -0700)]
jerasure: include generic objects in neon jerasure lib (like sse3/4)

Signed-off-by: Dan Mick <dan.mick@redhat.com>
9 years agoMerge pull request #10577 from wjwithagen/wip-wjw-test-rados-striper
Kefu Chai [Thu, 25 Aug 2016 15:30:21 +0000 (23:30 +0800)]
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>
9 years agoMerge pull request #10770 from dillaman/wip-16773
Mykola Golub [Thu, 25 Aug 2016 10:49:10 +0000 (13:49 +0300)]
Merge pull request #10770 from dillaman/wip-16773

librbd: interlock image refresh and exclusive lock operations

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #10831 from cbodley/wip-17051
Orit Wasserman [Thu, 25 Aug 2016 07:55:53 +0000 (09:55 +0200)]
Merge pull request #10831 from cbodley/wip-17051

rgw: delete region map after upgrade to zonegroup map
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoos/bluestore: ensure block device size is a multiple of the block size
Sage Weil [Wed, 24 Aug 2016 17:02:07 +0000 (13:02 -0400)]
os/bluestore: ensure block device size is a multiple of the block size

We might have a backing device that is an odd number of 512-byte sectors
but have the block_size configured to 4096.  Ensure the reported size
rounds down to avoid confusing other layers of the stack.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: fsck on mkfs (on by default)
Sage Weil [Wed, 24 Aug 2016 16:45:39 +0000 (12:45 -0400)]
os/bluestore: fsck on mkfs (on by default)

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #10824 from dachary/wip-17100-ceph-disk
Kefu Chai [Wed, 24 Aug 2016 14:46:05 +0000 (22:46 +0800)]
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>
9 years agoMerge pull request #10836 from weiqiaomiao/wqm-wip-period-update
Casey Bodley [Wed, 24 Aug 2016 12:58:12 +0000 (08:58 -0400)]
Merge pull request #10836 from weiqiaomiao/wqm-wip-period-update

rgw: fix period update --commit return error

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10829 from liewegas/wip-readme-make-dist
Alfredo Deza [Wed, 24 Aug 2016 11:48:51 +0000 (07:48 -0400)]
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>
9 years agoMerge pull request #10576 from wjwithagen/wip-wjw-noise-lockdep
Jason Dillaman [Wed, 24 Aug 2016 11:35:13 +0000 (07:35 -0400)]
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>
9 years agorados-striper.sh: Use expect_failure and conditional stringmatching
Willem Jan Withagen [Thu, 4 Aug 2016 21:34:19 +0000 (23:34 +0200)]
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>
9 years agoMerge pull request #10840 from david-z/wip-fix-manpage
Kefu Chai [Wed, 24 Aug 2016 10:51:44 +0000 (18:51 +0800)]
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>
9 years agodoc: fix wrong osdkeepalive name in mount.ceph manpage
Zhi Zhang [Wed, 24 Aug 2016 09:59:15 +0000 (17:59 +0800)]
doc: fix wrong osdkeepalive name in mount.ceph manpage

Signed-off-by: Zhi Zhang <zhangz.david@outlook.com>
9 years agoceph.spec.in: don't try to package __pycache__ for SUSE
Tim Serong [Fri, 19 Aug 2016 11:16:48 +0000 (21:16 +1000)]
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>
9 years agotests: populate /dev/disk/by-partuuid for scsi_debug
Loic Dachary [Tue, 23 Aug 2016 10:17:00 +0000 (12:17 +0200)]
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 9f76b9ff31525eac01f04450d72559ec99927496.

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>
9 years agocmake: use PERF_LOCAL_FLAGS only if defined
Michel Normand [Tue, 23 Aug 2016 15:24:15 +0000 (17:24 +0200)]
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>
9 years agocmake: do not link against keyutils if not necessary
Kefu Chai [Wed, 24 Aug 2016 03:10:47 +0000 (11:10 +0800)]
cmake: do not link against keyutils if not necessary

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: do not link secret.c if not necessary
Kefu Chai [Wed, 24 Aug 2016 03:12:31 +0000 (11:12 +0800)]
cmake: do not link secret.c if not necessary

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10811 from jimifm/master
Kefu Chai [Wed, 24 Aug 2016 01:51:44 +0000 (09:51 +0800)]
Merge pull request #10811 from jimifm/master

osd/ReplicatedPG: remove unused param "op" from generate_subop()

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agorgw: fix period update --commit return error
weiqiaomiao [Wed, 24 Aug 2016 01:38:03 +0000 (09:38 +0800)]
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>
9 years agoMerge pull request #10830 from SUSE/wip-fix-singleton-example
Loic Dachary [Tue, 23 Aug 2016 23:26:49 +0000 (01:26 +0200)]
Merge pull request #10830 from SUSE/wip-fix-singleton-example

doc: fix singleton example in Developer Guide

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agorgw: delete region map after upgrade to zonegroup map
Casey Bodley [Tue, 23 Aug 2016 19:10:44 +0000 (15:10 -0400)]
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>
9 years agoos/bluestore: fix whitespace in bitset apply helper
Sage Weil [Tue, 23 Aug 2016 18:55:45 +0000 (14:55 -0400)]
os/bluestore: fix whitespace in bitset apply helper

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agodoc: fix singleton example in Developer Guide
Nathan Cutler [Tue, 23 Aug 2016 18:53:36 +0000 (20:53 +0200)]
doc: fix singleton example in Developer Guide

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #10817 from stiopaa1/os_memstore_movePageSetObject
Sage Weil [Tue, 23 Aug 2016 18:27:43 +0000 (13:27 -0500)]
Merge pull request #10817 from stiopaa1/os_memstore_movePageSetObject

os/Memstore: move PageSetObject class to .cc file

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #10803 from stiopaa1/os_memstore_moveOmapIteratorImplClassToCC
Sage Weil [Tue, 23 Aug 2016 18:27:18 +0000 (13:27 -0500)]
Merge pull request #10803 from stiopaa1/os_memstore_moveOmapIteratorImplClassToCC

os/MemStore: move OmapIteratorImpl to cc file

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #10799 from stiopaa1/os_fusestore_removeUnneededHeader
Sage Weil [Tue, 23 Aug 2016 18:26:51 +0000 (13:26 -0500)]
Merge pull request #10799 from stiopaa1/os_fusestore_removeUnneededHeader

os/FuseStore: remove unneeded header file

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #10801 from stiopaa1/os_memstore_addOverride
Sage Weil [Tue, 23 Aug 2016 18:26:31 +0000 (13:26 -0500)]
Merge pull request #10801 from stiopaa1/os_memstore_addOverride

os/Memstore.h: add override to virtual functions

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoREADME.md: replace package build instructions with tarball instructions
Sage Weil [Tue, 23 Aug 2016 18:22:21 +0000 (14:22 -0400)]
README.md: replace package build instructions with tarball instructions

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agotest/common/test_util.cc: FreeBSD does not have distro information
Willem Jan Withagen [Tue, 2 Aug 2016 21:23:45 +0000 (23:23 +0200)]
test/common/test_util.cc: FreeBSD does not have distro information

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
9 years agolibrbd: remove unused refresh request logic
Jason Dillaman [Wed, 17 Aug 2016 19:16:37 +0000 (15:16 -0400)]
librbd: remove unused refresh request logic

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: interlock image refresh and lock operations
Jason Dillaman [Wed, 17 Aug 2016 18:58:22 +0000 (14:58 -0400)]
librbd: interlock image refresh and lock operations

Fixes: http://tracker.ceph.com/issues/16773
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: image state machine now has hooks for lock requests
Jason Dillaman [Wed, 17 Aug 2016 18:02:32 +0000 (14:02 -0400)]
librbd: image state machine now has hooks for lock requests

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: integrate asynchronous image rewatch state machine
Jason Dillaman [Tue, 16 Aug 2016 20:23:57 +0000 (16:23 -0400)]
librbd: integrate asynchronous image rewatch state machine

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: helper state machine for asynchronous watch recovery
Jason Dillaman [Mon, 15 Aug 2016 19:46:23 +0000 (15:46 -0400)]
librbd: helper state machine for asynchronous watch recovery

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: exclusive lock now supports reacquiring a lost lock
Jason Dillaman [Tue, 16 Aug 2016 18:20:20 +0000 (14:20 -0400)]
librbd: exclusive lock now supports reacquiring a lost lock

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: store exclusive lock cookie instead of recalculating
Jason Dillaman [Tue, 16 Aug 2016 17:11:19 +0000 (13:11 -0400)]
librbd: store exclusive lock cookie instead of recalculating

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: helper state machine to update lock cookie
Jason Dillaman [Tue, 16 Aug 2016 16:28:09 +0000 (12:28 -0400)]
librbd: helper state machine to update lock cookie

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agocls_lock: support updating the lock cookie without releasing the lock
Jason Dillaman [Mon, 15 Aug 2016 20:50:43 +0000 (16:50 -0400)]
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>
9 years agoMerge pull request #10743 from cbodley/wip-rgw-meta-sync-assert
Yehuda Sadeh [Tue, 23 Aug 2016 15:09:27 +0000 (08:09 -0700)]
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>
9 years agoMerge pull request #10032 from cbodley/wip-rgw-cr-deadlock
Yehuda Sadeh [Tue, 23 Aug 2016 15:03:01 +0000 (08:03 -0700)]
Merge pull request #10032 from cbodley/wip-rgw-cr-deadlock

rgw: add deadlock detection to RGWCoroutinesManager::run()

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #10821 from atheism/arm-read-improve
Kefu Chai [Tue, 23 Aug 2016 08:09:38 +0000 (16:09 +0800)]
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>
9 years agorpm: do not unnecessarily spawn shells for scriptlets
Nathan Cutler [Tue, 9 Aug 2016 09:48:07 +0000 (11:48 +0200)]
rpm: do not unnecessarily spawn shells for scriptlets

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoceph.spec.in: drop trouble-making divider comments
Nathan Cutler [Tue, 9 Aug 2016 09:39:47 +0000 (11:39 +0200)]
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>