]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agodoc: add openSUSE instructions to quick-start-preflight 10454/head
Nathan Cutler [Wed, 27 Jul 2016 14:37:05 +0000 (16:37 +0200)]
doc: add openSUSE instructions to quick-start-preflight

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #10594 from michelmno/forpull2
Nathan Cutler [Mon, 8 Aug 2016 18:56:10 +0000 (20:56 +0200)]
Merge pull request #10594 from michelmno/forpull2

rpm: ExclusiveArch for suse_version

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #10122 from Yan-waller/yj-wiph-rgwradoscc-0704
Casey Bodley [Mon, 8 Aug 2016 18:51:28 +0000 (14:51 -0400)]
Merge pull request #10122 from Yan-waller/yj-wiph-rgwradoscc-0704

rgw: fix the missing return value

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10194 from Yan-waller/yj-wip-rgwrados-0708
Casey Bodley [Mon, 8 Aug 2016 18:46:27 +0000 (14:46 -0400)]
Merge pull request #10194 from Yan-waller/yj-wip-rgwrados-0708

rgw: remove unused bufferlist variable

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10203 from Yan-waller/yj-wip-rgwcache-0708
Casey Bodley [Mon, 8 Aug 2016 18:45:48 +0000 (14:45 -0400)]
Merge pull request #10203 from Yan-waller/yj-wip-rgwcache-0708

rgw: merge setting flags operation together and cleanups

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10214 from theanalyst/rgw/multisite-fwd-log-cleanup
Casey Bodley [Mon, 8 Aug 2016 18:42:32 +0000 (14:42 -0400)]
Merge pull request #10214 from theanalyst/rgw/multisite-fwd-log-cleanup

rgw: drop create_bucket in fwd_request log message

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10226 from Yan-waller/yj-wip-rgwrests3-0709
Casey Bodley [Mon, 8 Aug 2016 18:41:39 +0000 (14:41 -0400)]
Merge pull request #10226 from Yan-waller/yj-wip-rgwrests3-0709

rgw: use the standard usage of string.find

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10299 from Yan-waller/yj-wiph-rgwmetadata-0715
Casey Bodley [Mon, 8 Aug 2016 18:35:48 +0000 (14:35 -0400)]
Merge pull request #10299 from Yan-waller/yj-wiph-rgwmetadata-0715

rgw: miscellaneous cleanups

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10408 from weiqiaomiao/wqm-wip-rgw-lc-set
Casey Bodley [Mon, 8 Aug 2016 18:34:25 +0000 (14:34 -0400)]
Merge pull request #10408 from weiqiaomiao/wqm-wip-rgw-lc-set

rgw: fix wrong variable definition in rgw_cls_lc_set_entry function

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10562 from aclamk/wip-rgw-s3-keystone-cache-mutex
Casey Bodley [Mon, 8 Aug 2016 18:26:29 +0000 (14:26 -0400)]
Merge pull request #10562 from aclamk/wip-rgw-s3-keystone-cache-mutex

rgw: Got rid of recursive mutex.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10424 from theanalyst/rgw/mp-complete-error-msg
Casey Bodley [Mon, 8 Aug 2016 18:25:20 +0000 (14:25 -0400)]
Merge pull request #10424 from theanalyst/rgw/mp-complete-error-msg

rgw: log mp upload failures due to parts mismatch

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10475 from yonghengdexin735/wip-zzz-rgw
Casey Bodley [Mon, 8 Aug 2016 18:14:35 +0000 (14:14 -0400)]
Merge pull request #10475 from yonghengdexin735/wip-zzz-rgw

rgw/rgw_main: fix unnecessary variables defined

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10589 from Yan-waller/yj-wip-rgwcls-0805
Casey Bodley [Mon, 8 Aug 2016 18:08:37 +0000 (14:08 -0400)]
Merge pull request #10589 from Yan-waller/yj-wip-rgwcls-0805

rgw: remove unused variables

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10611 from linuxbox2/rgw-nfs-28
Casey Bodley [Mon, 8 Aug 2016 17:56:27 +0000 (13:56 -0400)]
Merge pull request #10611 from linuxbox2/rgw-nfs-28

Rgw nfs 28

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw nfs: fix write continuations 10611/head
Matt Benjamin [Sun, 7 Aug 2016 22:39:33 +0000 (18:39 -0400)]
rgw nfs: fix write continuations

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agorgw nfs: don't leak fh->mtx in lookup_handle()
Matt Benjamin [Fri, 5 Aug 2016 14:03:33 +0000 (10:03 -0400)]
rgw nfs: don't leak fh->mtx in lookup_handle()

This change fixes a serious latent locking problem, noticed after
updating the ganesha/rgw driver invalidation after renames.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agorgw file: refuse to rename directories
Matt Benjamin [Mon, 8 Aug 2016 14:18:35 +0000 (10:18 -0400)]
rgw file: refuse to rename directories

The representation of paths as an aggregate involving any
number of objects argues against ever permitting such
operations.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agorgw_file: refuse ops on deleted targets
Matt Benjamin [Wed, 3 Aug 2016 17:53:15 +0000 (13:53 -0400)]
rgw_file: refuse ops on deleted targets

Detect these illegal cases, as they are indicate various incorrect
behaviors/bugs.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agoMerge pull request #10598 from dillaman/wip-16882
Kefu Chai [Mon, 8 Aug 2016 04:01:49 +0000 (12:01 +0800)]
Merge pull request #10598 from dillaman/wip-16882

cmake: correct ceph_test_librbd/ceph_test_rbd_mirror linkage

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9566 from ffilz/master
John Spray [Sun, 7 Aug 2016 14:49:20 +0000 (15:49 +0100)]
Merge pull request #9566 from ffilz/master

Add ceph_ll_setlk and ceph_ll_getlk

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #10452 from jcsp/wip-16556
John Spray [Sun, 7 Aug 2016 14:48:49 +0000 (15:48 +0100)]
Merge pull request #10452 from jcsp/wip-16556

test: break out librados-using cephfs test

9 years agoMerge pull request #10574 from dillaman/wip-16923
Mykola Golub [Sun, 7 Aug 2016 10:33:45 +0000 (13:33 +0300)]
Merge pull request #10574 from dillaman/wip-16923

librbd: delay acquiring lock if image watch has failed

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #10581 from dillaman/wip-16887
Mykola Golub [Sun, 7 Aug 2016 10:33:01 +0000 (13:33 +0300)]
Merge pull request #10581 from dillaman/wip-16887

librbd: prevent creation of v2 image ids that are too large

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agocmake: correct ceph_test_librbd/ceph_test_rbd_mirror linkage 10598/head
Jason Dillaman [Fri, 5 Aug 2016 19:34:00 +0000 (15:34 -0400)]
cmake: correct ceph_test_librbd/ceph_test_rbd_mirror linkage

This now matches the autotools configuration and fixes the failed
assertion during test execution.

Fixes: http://tracker.ceph.com/issues/16882
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #10579 from dreamhost/wip-16928
Matt Benjamin [Fri, 5 Aug 2016 19:26:57 +0000 (15:26 -0400)]
Merge pull request #10579 from dreamhost/wip-16928

rgw: Fix civetweb IPv6

verified:  autobuild

9 years agoMerge pull request #10597 from pritha-srivastava/wip_ldap_fix
Matt Benjamin [Fri, 5 Aug 2016 19:02:55 +0000 (15:02 -0400)]
Merge pull request #10597 from pritha-srivastava/wip_ldap_fix

rgw: Fix for incorrect access key id in reworked ldap auth code.

verified non-regression (MS AD)

9 years agorgw: Fix for incorrect access key id reworked ldap auth code. 10597/head
Pritha Srivastava [Fri, 5 Aug 2016 16:13:33 +0000 (21:43 +0530)]
rgw: Fix for incorrect access key id reworked ldap auth code.

The reworked ldap code does not use the correct access key id in get_policy.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
9 years agoMerge pull request #10595 from tchaikov/wip-rocksdb
Jason Dillaman [Fri, 5 Aug 2016 15:41:00 +0000 (11:41 -0400)]
Merge pull request #10595 from tchaikov/wip-rocksdb

rocksdb: revert the change introduced by dc41731

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agorocksdb: revert the change introduced by dc41731 10595/head
Kefu Chai [Fri, 5 Aug 2016 15:33:52 +0000 (23:33 +0800)]
rocksdb: revert the change introduced by dc41731

dc41731 reverts the submodule reference of rocksdb, and point it to an
older version which fails to support ppc64le and AArch64.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10262 from dachary/wip-16580-ceph-disk-timeout
Yuri Weinstein [Fri, 5 Aug 2016 15:22:39 +0000 (08:22 -0700)]
Merge pull request #10262 from dachary/wip-16580-ceph-disk-timeout

ceph-disk: timeout ceph-disk to avoid blocking forever

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Ken Dreyer (Red Hat) <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.cz>
9 years agoMerge pull request #10491 from xiexingguo/xxg-wip-osdmon-2016-07-28
Yuri Weinstein [Fri, 5 Aug 2016 15:14:02 +0000 (08:14 -0700)]
Merge pull request #10491 from xiexingguo/xxg-wip-osdmon-2016-07-28

osd/OSDMonitor: misc. fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9259 from xiexingguo/xxg-wip-fix-monclientpinger
Yuri Weinstein [Fri, 5 Aug 2016 15:12:29 +0000 (08:12 -0700)]
Merge pull request #9259 from xiexingguo/xxg-wip-fix-monclientpinger

mon: MonClient may hang on pinging an unresponsive monitor

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10593 from linuxbox2/ldap-bindv3-again
Casey Bodley [Fri, 5 Aug 2016 15:11:36 +0000 (11:11 -0400)]
Merge pull request #10593 from linuxbox2/ldap-bindv3-again

rgw ldap: enforce simple_bind w/LDAPv3

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9718 from songbaisen/a8
Yuri Weinstein [Fri, 5 Aug 2016 15:09:58 +0000 (08:09 -0700)]
Merge pull request #9718 from songbaisen/a8

mon: clear list in better way

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10392 from stiopaa1/mon_monclient_moveCCancelMonCommand
Yuri Weinstein [Fri, 5 Aug 2016 15:09:07 +0000 (08:09 -0700)]
Merge pull request #10392 from stiopaa1/mon_monclient_moveCCancelMonCommand

mon/MonClient: move C_CancelMonCommand to cc file

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10470 from xiexingguo/xxg-wip-osd-2016-07-28
Yuri Weinstein [Fri, 5 Aug 2016 15:08:19 +0000 (08:08 -0700)]
Merge pull request #10470 from xiexingguo/xxg-wip-osd-2016-07-28

osd: minor performance improvements

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #10539 from jcsp/wip-mds-counters
John Spray [Fri, 5 Aug 2016 14:55:56 +0000 (15:55 +0100)]
Merge pull request #10539 from jcsp/wip-mds-counters

mds: add perf counters for MDLog replay and SessionMap

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agorgw ldap: enforce simple_bind w/LDAPv3 10593/head
Matt Benjamin [Fri, 5 Aug 2016 14:02:03 +0000 (10:02 -0400)]
rgw ldap: enforce simple_bind w/LDAPv3

Found by Harald Klein <hklein@redhat.com>.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agoExclusiveArch for suse_version 10594/head
Michel Normand [Fri, 5 Aug 2016 14:34:48 +0000 (16:34 +0200)]
ExclusiveArch for suse_version

for SLES supports only x86_64 and aarch64 targets
for openSUSE (Tumbleweed and Leap) add ppc64/ppc64le targets.

fixes: http://tracker.ceph.com/issues/16936
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
9 years agoMerge pull request #10542 from ktdreyer/doc-rbd-libvirt-logging
Jason Dillaman [Fri, 5 Aug 2016 13:52:06 +0000 (09:52 -0400)]
Merge pull request #10542 from ktdreyer/doc-rbd-libvirt-logging

doc: describe libvirt client logging

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #10488 from lande1234/wip-lan-testing
Jason Dillaman [Fri, 5 Aug 2016 13:20:37 +0000 (09:20 -0400)]
Merge pull request #10488 from lande1234/wip-lan-testing

rbd-mirror: add additional test scenarios

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #10573 from renhwztetecs/renhw-wip-doc-cephfs
John Spray [Fri, 5 Aug 2016 11:26:21 +0000 (12:26 +0100)]
Merge pull request #10573 from renhwztetecs/renhw-wip-doc-cephfs

doc/mds: fixup mds doc

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agomds: add perf counter for rate of replay 10539/head
John Spray [Tue, 2 Aug 2016 12:01:17 +0000 (13:01 +0100)]
mds: add perf counter for rate of replay

Useful for watching the progress of a daemon
in standby-replay or replay.

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agomds: expose perf counters for SessionMap
John Spray [Sun, 31 Jul 2016 22:20:33 +0000 (23:20 +0100)]
mds: expose perf counters for SessionMap

So that we can see how many sessions exist via
the counters rather than only by looking at status.

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #10512 from renhwztetecs/renhw-wip-mds-balancer
John Spray [Fri, 5 Aug 2016 11:01:12 +0000 (12:01 +0100)]
Merge pull request #10512 from renhwztetecs/renhw-wip-mds-balancer

mds/MDBalancer: cleanup

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #10485 from gregsfortytwo/wip-client-dump-complete
John Spray [Fri, 5 Aug 2016 11:00:05 +0000 (12:00 +0100)]
Merge pull request #10485 from gregsfortytwo/wip-client-dump-complete

client: include COMPLETE and ORDERED states in cache dump

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #10533 from gregsfortytwo/wip-mds-dispatch-refcount
John Spray [Fri, 5 Aug 2016 10:59:21 +0000 (11:59 +0100)]
Merge pull request #10533 from gregsfortytwo/wip-mds-dispatch-refcount

mds: fix up _dispatch ref-counting semantics

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #10540 from jcsp/wip-mds-multimds-standby
John Spray [Fri, 5 Aug 2016 10:58:32 +0000 (11:58 +0100)]
Merge pull request #10540 from jcsp/wip-mds-multimds-standby

mds: fix daemon selection when starting ranks

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agorgw: remove unused variables 10589/head
Yan Jun [Fri, 5 Aug 2016 08:41:00 +0000 (16:41 +0800)]
rgw: remove unused variables

remove the unused bufferlist variables

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
9 years agolibrbd: prevent creation of v2 image ids that are too large 10581/head
Jason Dillaman [Fri, 5 Aug 2016 00:40:10 +0000 (20:40 -0400)]
librbd: prevent creation of v2 image ids that are too large

The librbd API is capped at 24 characters for expressing the
object prefix for data blocks (including trailing null byte).

Fixes: http://tracker.ceph.com/issues/16887
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorgw: Fix civetweb IPv6 10579/head
Robin H. Johnson [Fri, 5 Aug 2016 00:15:18 +0000 (17:15 -0700)]
rgw: Fix civetweb IPv6

Commit c38e3cbb6f7c6221209f2b512cba18c564c895a4 introduced a second
compiled version of src/civetweb/src/civetweb.c, but did not pass the
configuration header (civetweb/include/civetweb_conf.h).

As a result, USE_IPV6 was not defined when it was compiled, and that
copy was included into the radosgw binary. This caused breakage for the
civetweb frontend when used with IPv6:
  rgw frontends = civetweb port=[::]:7480

Reintroduce the header so that civetweb is compiled correctly again.

Fixes: http://tracker.ceph.com/issues/16928
Backport: jewel
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
9 years agoMerge pull request #10565 from dzafman/wip-16672
David Zafman [Fri, 5 Aug 2016 00:01:12 +0000 (17:01 -0700)]
Merge pull request #10565 from dzafman/wip-16672

OSD crash with Hammer to Jewel Upgrade: void FileStore::init_temp_collections()

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #10545 from trociny/fixup-rbd-mirror-test
Jason Dillaman [Thu, 4 Aug 2016 21:01:57 +0000 (17:01 -0400)]
Merge pull request #10545 from trociny/fixup-rbd-mirror-test

qa/workunits/rbd: wait for image deleted before checking health

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agodoc: describe libvirt client logging 10542/head
Ken Dreyer [Tue, 2 Aug 2016 15:30:10 +0000 (09:30 -0600)]
doc: describe libvirt client logging

Describe how to configure logging and the admin socket for debugging RBD
libvirt clients.

Thanks to Jason Dillman <jdillama@redhat.com> on ceph-devel for this
information.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
9 years agolibrbd: delay acquiring exclusive lock if watch has failed 10574/head
Jason Dillaman [Thu, 4 Aug 2016 17:24:54 +0000 (13:24 -0400)]
librbd: delay acquiring exclusive lock if watch has failed

Fixes: http://tracker.ceph.com/issues/16923
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: convert ImageWatcher class to template
Jason Dillaman [Thu, 4 Aug 2016 17:47:33 +0000 (13:47 -0400)]
librbd: convert ImageWatcher class to template

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #10566 from batrick/mds-daemon-unused
John Spray [Thu, 4 Aug 2016 13:10:45 +0000 (14:10 +0100)]
Merge pull request #10566 from batrick/mds-daemon-unused

mds: remove unused MDSDaemon::objecter

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agodoc/mds: add generated files into the /etc/ceph/ 10573/head
huanwen ren [Thu, 4 Aug 2016 11:50:18 +0000 (19:50 +0800)]
doc/mds: add generated files into the /etc/ceph/

Fixes: 16906
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
9 years agomds: remove unused MDSDaemon::objecter 10566/head
Patrick Donnelly [Thu, 4 Aug 2016 02:03:28 +0000 (22:03 -0400)]
mds: remove unused MDSDaemon::objecter

Leftover from a2682edb76ceac428c686e0ac21c06511e27693e.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
9 years agoMerge pull request #10307 from pritha-srivastava/wip_s3_auth_rework
Matt Benjamin [Wed, 3 Aug 2016 16:39:26 +0000 (12:39 -0400)]
Merge pull request #10307 from pritha-srivastava/wip_s3_auth_rework

rgw: Rework of s3 LDAP Authentication code.

verified: MS AD

9 years agoGot rid of recursive mutex. 10562/head
Adam Kupczyk [Wed, 3 Aug 2016 15:56:30 +0000 (17:56 +0200)]
Got rid of recursive mutex.

Signed-off-by: Adam Kupczyk <akupczyk@mirantis.com>
9 years agoos: Fix HashIndex::recursive_remove() to remove everything but original path 10565/head
David Zafman [Wed, 3 Aug 2016 05:32:02 +0000 (22:32 -0700)]
os: Fix HashIndex::recursive_remove() to remove everything but original path

Fixes: http://tracker.ceph.com/issues/16672
Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agofilestore: Clear objects before calling collection_list() again
David Zafman [Wed, 3 Aug 2016 06:26:41 +0000 (23:26 -0700)]
filestore: Clear objects before calling collection_list() again

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agofilestore: Improve logging
David Zafman [Wed, 3 Aug 2016 06:24:12 +0000 (23:24 -0700)]
filestore: Improve logging

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agomds/MDBalancer: change OPT_FLOAT to OPT_DOUBLE 10512/head
huanwen ren [Sat, 30 Jul 2016 05:50:24 +0000 (13:50 +0800)]
mds/MDBalancer: change OPT_FLOAT to OPT_DOUBLE

utime_t convert double in MDBalancer::tick(),
so g_conf->mds_bal_sample_interval should be set OPT_DOUBLE

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
9 years agomds/MDBalancer: redundance cleanup
huanwen ren [Fri, 29 Jul 2016 05:55:57 +0000 (13:55 +0800)]
mds/MDBalancer: redundance cleanup

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
9 years agomds/MDBalancer: some types of definitions are cleanup
huanwen ren [Fri, 29 Jul 2016 03:31:03 +0000 (11:31 +0800)]
mds/MDBalancer: some types of definitions are cleanup

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
9 years agomds/MDBalancer: add err info when ifstream open failure
huanwen ren [Thu, 28 Jul 2016 08:05:00 +0000 (16:05 +0800)]
mds/MDBalancer: add err info when ifstream open failure

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
9 years agoMerge remote-tracking branch 'upstream/pull/10543/head'
Patrick Donnelly [Tue, 2 Aug 2016 19:40:49 +0000 (15:40 -0400)]
Merge remote-tracking branch 'upstream/pull/10543/head'

* upstream/pull/10543/head:
  vstart.sh: only delete conf if -n

9 years agoMerge pull request #10492 from chhabaramesh/master
Igor Fedotov [Tue, 2 Aug 2016 18:43:41 +0000 (21:43 +0300)]
Merge pull request #10492 from chhabaramesh/master

os/bluestore: remove cmake warning from extent alloc functions

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agovstart.sh: only delete conf if -n 10543/head
Patrick Donnelly [Tue, 2 Aug 2016 18:13:18 +0000 (14:13 -0400)]
vstart.sh: only delete conf if -n

src/test/ceph_objectstore_tool.py depends on an implicit "-k" when not
creating a new cluster. (Deleting the conf file without -n makes no
sense anyway.)

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
9 years agoMerge pull request #10462 from dillaman/wip-16478
Mykola Golub [Tue, 2 Aug 2016 17:48:07 +0000 (20:48 +0300)]
Merge pull request #10462 from dillaman/wip-16478

rbd-mirror: non-primary image is recording journal events during image sync

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #10484 from dillaman/wip-16538
Mykola Golub [Tue, 2 Aug 2016 17:14:54 +0000 (20:14 +0300)]
Merge pull request #10484 from dillaman/wip-16538

rbd-mirror: image deleter should use pool id + global image uuid for key

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoqa/workunits/rbd: wait for image deleted before checking health 10545/head
Mykola Golub [Tue, 2 Aug 2016 17:06:17 +0000 (20:06 +0300)]
qa/workunits/rbd: wait for image deleted before checking health

This is a fixup to the previous commit.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #10458 from gregsfortytwo/wip-doc-troubleshooting
John Spray [Tue, 2 Aug 2016 17:04:31 +0000 (18:04 +0100)]
Merge pull request #10458 from gregsfortytwo/wip-doc-troubleshooting

doc: extend the CephFS troubleshooting guide

Reviewed-by: Zack Cerza <zack@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #9695 from ktdreyer/doc-tarballs-url
Alfredo Deza [Tue, 2 Aug 2016 15:50:47 +0000 (11:50 -0400)]
Merge pull request #9695 from ktdreyer/doc-tarballs-url

doc: update canonical tarballs URL

Reviewed-by: Alfredo Deza <adeza@redhat.com>
9 years agoos/bluestore: remove cmake warning from extent alloc functions. 10492/head
Ramesh Chander [Fri, 29 Jul 2016 09:16:57 +0000 (02:16 -0700)]
os/bluestore: remove cmake warning from extent alloc functions.
link: http://tracker.ceph.com/issues/16766
Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
9 years agoMerge pull request #10386 from ceph/wip-jlayton-nlink
John Spray [Tue, 2 Aug 2016 15:29:45 +0000 (16:29 +0100)]
Merge pull request #10386 from ceph/wip-jlayton-nlink

Fix attribute handling at lookup time

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #10541 from tchaikov/wip-cmake
Kefu Chai [Tue, 2 Aug 2016 15:10:08 +0000 (23:10 +0800)]
Merge pull request #10541 from tchaikov/wip-cmake

cmake: install ceph_test_rados_striper_api_*

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agocmake: install ceph_test_rados_striper_api_* 10541/head
Kefu Chai [Tue, 2 Aug 2016 14:37:45 +0000 (22:37 +0800)]
cmake: install ceph_test_rados_striper_api_*

so we can test them in ceph-qa-suite

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agotest: unit test cases for disabling librbd journal by policy 10462/head
Jason Dillaman [Wed, 27 Jul 2016 03:28:43 +0000 (23:28 -0400)]
test: unit test cases for disabling librbd journal by policy

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: utilize factory methods to create AioObjectRequest objects
Jason Dillaman [Wed, 27 Jul 2016 14:56:48 +0000 (10:56 -0400)]
librbd: utilize factory methods to create AioObjectRequest objects

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: convert AioObjectRequest/AioObjectRead classes to templates
Jason Dillaman [Wed, 27 Jul 2016 13:07:00 +0000 (09:07 -0400)]
librbd: convert AioObjectRequest/AioObjectRead classes to templates

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: move read callback helpers to narrowest scope
Jason Dillaman [Wed, 27 Jul 2016 13:54:44 +0000 (09:54 -0400)]
librbd: move read callback helpers to narrowest scope

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: convert AioImageRequest derived classes to templates
Jason Dillaman [Wed, 27 Jul 2016 03:26:08 +0000 (23:26 -0400)]
librbd: convert AioImageRequest derived classes to templates

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: removed namespace indentation from legacy classes
Jason Dillaman [Wed, 27 Jul 2016 12:49:44 +0000 (08:49 -0400)]
librbd: removed namespace indentation from legacy classes

Better follows the Ceph C++ style guide

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: do not record journal events if append is disabled by policy
Jason Dillaman [Wed, 27 Jul 2016 02:58:24 +0000 (22:58 -0400)]
librbd: do not record journal events if append is disabled by policy

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: remove unused journal replay canceled callback
Jason Dillaman [Wed, 27 Jul 2016 00:57:40 +0000 (20:57 -0400)]
librbd: remove unused journal replay canceled callback

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: optionally support disabling journal appends via policy
Jason Dillaman [Wed, 27 Jul 2016 00:48:13 +0000 (20:48 -0400)]
librbd: optionally support disabling journal appends via policy

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #10505 from wjwithagen/wip-wjw-dns-resolv
Casey Bodley [Tue, 2 Aug 2016 13:12:39 +0000 (09:12 -0400)]
Merge pull request #10505 from wjwithagen/wip-wjw-dns-resolv

src/common/dns_resolve.cc: reorder the includes

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agomds: fix daemon selection when starting ranks 10540/head
John Spray [Mon, 1 Aug 2016 00:29:14 +0000 (01:29 +0100)]
mds: fix daemon selection when starting ranks

Previously, if "standby for rank" was set, but
"standby for fscid" wasn't, the daemon wouldn't
be recognised as the right one for the rank,
and we would end up promoting some arbitrary
standby.

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoceph: don't fudge the ctime in stat() unless it's really older than the mtime 10386/head
Jeff Layton [Mon, 1 Aug 2016 13:01:15 +0000 (09:01 -0400)]
ceph: don't fudge the ctime in stat() unless it's really older than the mtime

The current code just looks at the sec field, but the difference may
only be evident in the nsec field.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
9 years agoclient: only skip querying the MDS in _lookup when we have the necessary caps
Jeff Layton [Mon, 1 Aug 2016 13:01:15 +0000 (09:01 -0400)]
client: only skip querying the MDS in _lookup when we have the necessary caps

If we don't have the caps we'll need later, then we must reissue the
lookup to get them regardless of whether we have a lease on the
dentry.

Fixes: http://tracker.ceph.com/issues/16668
Signed-off-by: Jeff Layton <jlayton@redhat.com>
9 years agoclient: plumb a mask argument into _lookup
Jeff Layton [Mon, 1 Aug 2016 13:01:14 +0000 (09:01 -0400)]
client: plumb a mask argument into _lookup

...and attempt to pass in a sane value there, based on what we'll do
with the resulting inode.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
9 years agoclient: add mask parameter to _do_lookup
Jeff Layton [Mon, 1 Aug 2016 13:01:14 +0000 (09:01 -0400)]
client: add mask parameter to _do_lookup

We need to allow callers to specify caps to acquire during a lookup, as
they may need to scrape certain info out of the inode later. Allow them
to pass in a mask. For now, _lookup just passes in 0 for the mask,
but verify_reply_trace passes in the regetattr_mask to match what we'd
request in the _getattr request if there were a traceless reply.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
9 years agotest: add a link count test
Jeff Layton [Mon, 1 Aug 2016 13:01:14 +0000 (09:01 -0400)]
test: add a link count test

...and use the lowlevel calls to emulate what ganesha would do. In
particular, it dumps its inode from the cache after an unlink. So
do a second lookup afterward and verify that the nlink field in the
struct stat is valid.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
9 years agodoc: add a new document on capabilities
Jeff Layton [Mon, 1 Aug 2016 13:01:14 +0000 (09:01 -0400)]
doc: add a new document on capabilities

Signed-off-by: Jeff Layton <jlayton@redhat.com>
9 years agocephfs: remove some unused constants
Jeff Layton [Tue, 2 Aug 2016 11:19:53 +0000 (07:19 -0400)]
cephfs: remove some unused constants

The CEPH_CAP_SFLOCK shift value (and the other constants derived from
it) are entirely unused. Ditto for CEPH_CAP_BITS. Just remove them.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
9 years agodoc/mds: consistent with "../doc/rados/deployment/index.rst"
huanwen ren [Tue, 2 Aug 2016 08:50:15 +0000 (16:50 +0800)]
doc/mds: consistent with "../doc/rados/deployment/index.rst"

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
9 years agoMerge pull request #10535 from dzafman/wip-cot-fix
Kefu Chai [Tue, 2 Aug 2016 07:37:57 +0000 (15:37 +0800)]
Merge pull request #10535 from dzafman/wip-cot-fix

test: Removeall merged after print_function commit needs a fix

Reviewed-by: Kefu Chai <kchai@redhat.com>