Commit Graph

56632 Commits

Author SHA1 Message Date
Patrick Donnelly
c162a8a08d
Merge remote-tracking branch 'upstream/pull/10543/head'
* upstream/pull/10543/head:
  vstart.sh: only delete conf if -n
2016-08-02 15:40:49 -04:00
Igor Fedotov
119f06fcc4 Merge pull request #10492 from chhabaramesh/master
os/bluestore: remove cmake warning from extent alloc functions

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
2016-08-02 21:43:41 +03:00
Patrick Donnelly
c3ca7ad40c
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>
2016-08-02 14:17:35 -04:00
Mykola Golub
57b69b9200 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>
2016-08-02 20:48:07 +03:00
Mykola Golub
42905a6d3b 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>
2016-08-02 20:14:54 +03:00
Mykola Golub
a5f63f7261 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>
2016-08-02 20:06:17 +03:00
John Spray
48cd11fece 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>
2016-08-02 18:04:31 +01:00
Alfredo Deza
79b011881e Merge pull request #9695 from ktdreyer/doc-tarballs-url
doc: update canonical tarballs URL

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2016-08-02 11:50:47 -04:00
Ramesh Chander
4fc84ad9f8 os/bluestore: remove cmake warning from extent alloc functions.
tracker link: http://tracker.ceph.com/issues/16766
Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
2016-08-02 08:39:28 -07:00
John Spray
01cd578cbc Merge pull request #10386 from ceph/wip-jlayton-nlink
Fix attribute handling at lookup time

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-08-02 16:29:45 +01:00
Kefu Chai
af113a4760 Merge pull request #10541 from tchaikov/wip-cmake
cmake: install ceph_test_rados_striper_api_*

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-08-02 23:10:08 +08:00
Kefu Chai
62e51717f3 cmake: install ceph_test_rados_striper_api_*
so we can test them in ceph-qa-suite

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-08-02 22:38:00 +08:00
Jason Dillaman
4a256f5044 test: unit test cases for disabling librbd journal by policy
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-08-02 09:57:25 -04:00
Jason Dillaman
2e5076eb19 librbd: utilize factory methods to create AioObjectRequest objects
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-08-02 09:56:21 -04:00
Jason Dillaman
840a473e7f librbd: convert AioObjectRequest/AioObjectRead classes to templates
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-08-02 09:56:21 -04:00
Jason Dillaman
65b336f685 librbd: move read callback helpers to narrowest scope
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-08-02 09:56:21 -04:00
Jason Dillaman
a945c2c235 librbd: convert AioImageRequest derived classes to templates
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-08-02 09:56:21 -04:00
Jason Dillaman
f1e391982b librbd: removed namespace indentation from legacy classes
Better follows the Ceph C++ style guide

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-08-02 09:56:21 -04:00
Jason Dillaman
405142c615 librbd: do not record journal events if append is disabled by policy
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-08-02 09:56:21 -04:00
Jason Dillaman
f453554edc librbd: remove unused journal replay canceled callback
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-08-02 09:56:21 -04:00
Jason Dillaman
f7eeacd02f librbd: optionally support disabling journal appends via policy
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-08-02 09:56:21 -04:00
Casey Bodley
4d95e5c00e 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>
2016-08-02 09:12:39 -04:00
John Spray
39e1b65792 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>
2016-08-02 14:03:17 +01:00
Jeff Layton
14ee7bcbf0 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>
2016-08-02 07:20:08 -04:00
Jeff Layton
9e8476743e 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>
2016-08-02 07:20:08 -04:00
Jeff Layton
f3605d39e5 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>
2016-08-02 07:20:08 -04:00
Jeff Layton
a2ce16f8bf 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>
2016-08-02 07:20:08 -04:00
Jeff Layton
e8a898925a 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>
2016-08-02 07:20:08 -04:00
Jeff Layton
d85ba5758a doc: add a new document on capabilities
Signed-off-by: Jeff Layton <jlayton@redhat.com>
2016-08-02 07:20:05 -04:00
Jeff Layton
c0bba0f9e4 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>
2016-08-02 07:20:05 -04:00
huanwen ren
d40e9aaead doc/mds: consistent with "../doc/rados/deployment/index.rst"
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
2016-08-02 16:50:15 +08:00
Kefu Chai
9fa7af97b5 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>
2016-08-02 15:37:57 +08:00
David Zafman
f58063578c test: Removeall merged after print_function commit needs a fix
Signed-off-by: David Zafman <dzafman@redhat.com>
2016-08-01 22:29:56 -07:00
Greg Farnum
12253367fd mds: fix up _dispatch ref-counting semantics
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2016-08-01 19:38:20 -07:00
xie xingguo
966c7c2bc4 common/config: change type of osd_mon_ack_timeout from int to double
We may use osd_mon_ack_timeout the following way:
  double backoff = stats_ack_timeout / g_conf->osd_mon_ack_timeout;
which is at risk of precision lost.

Example:

main()
{
  double r = 5 / 30;
  cout << "r = " << r << std::endl;
}

Output:
  r = 0

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-08-02 06:54:57 +08:00
xie xingguo
4ff6c8190f osd: drop idle increasement of iterator of clear_queued_recovery()
Because we are going to return anyway under this case.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-08-02 06:54:57 +08:00
xie xingguo
3e3def6e53 osd: drop buffer-related stats from _dispatch()
By moving the buffer-related stats into tick_without_osd_lock(),
we are already accurate enough updating period of these counters.
So there is no need to do this in this time-senstive method,
which holds the big osd_lock.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-08-02 06:54:57 +08:00
xie xingguo
1addc92fc4 osd: move buffer-related stats from tick() to tick_without_osd_lock()
1. these counters are of type atomic_t and are public-access safe.

2. since the tick() thread requires the big osd_lock and thus may
   not tick at a constant interval, it is good for accuracy and
   performance to move the buffer-related stats to the
   tick_without_osd_lock() thread instead.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-08-02 06:54:57 +08:00
xie xingguo
013f394d83 osd/ReplicatedPG: avoid unnecessary implicitly cast
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-08-02 06:54:57 +08:00
xie xingguo
895a9d9206 common/hobject: make set_bitwise_key_u32() faster
For now BlueStore is the only caller of set_bitwise_key_u32(),
and it will always passed in hash_reverse_bits.

Since this is one of the basic and key method of BlueStore, it makes
sense to make it a little faster.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-08-02 06:54:57 +08:00
Josh Durgin
98b9ed1d7c Merge pull request #10344 from xiexingguo:xxg-wip-pipe-2016-07-19-02
msg/simple: apply prefetch policy more precisely

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Conflicts:
	src/msg/simple/Pipe.cc (removed unneeded cast)
2016-08-01 15:40:39 -07:00
Ali Maredia
f9be456d34 Merge pull request #10532 from linuxbox2/rgw-ldap-recon
rgw: add reinit/rebind logic (ldap)

Reviewed-by: Ali Maredia <amaredia@redhat.com>
2016-08-01 18:08:36 -04:00
Matt Benjamin
9b8fccf687 rgw: add reinit/rebind logic (ldap)
Gracefully handle stale LDAP connections by rebinding--verified
with MS AD.  Rebind is attempted once per request until rebound--
not worse than misconfiguring the environment.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-08-01 17:36:17 -04:00
Yuri Weinstein
c39e671ce5 Merge pull request #10365 from majianpeng/osd-perfcounter
osd/ReplicatedPG: for sync-read it don't cacl l_osd_op_r_prepare_lat.

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-08-01 14:30:05 -07:00
Yuri Weinstein
9d811caf34 Merge pull request #10450 from xiexingguo/xxg-wip-cleanup-options
osd: cleanup options and other redundancies

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-08-01 14:29:39 -07:00
Yuri Weinstein
4f5e4dff68 Merge pull request #10471 from xiexingguo/xxg-wip-fix-memdb-assert
kv/MemDB: fix assert triggerred by m_total_bytes underflow
2016-08-01 14:28:39 -07:00
Yuri Weinstein
a602346880 Merge pull request #9679 from xiexingguo/xxg-wip-fix-cephx
auth/cephx: misc fixes

Reviewed-by: Sage Weil <sage@redhat.com>
2016-08-01 14:27:27 -07:00
Yuri Weinstein
ef97f9393b Merge pull request #9734 from xiexingguo/xxg-wip-cleanup-omap
os/filestore: add sanity checks and cleanups for mount() process

Reviewed-by: Sage Weil <sage@redhat.com>
2016-08-01 14:26:43 -07:00
Yuri Weinstein
e08022f566 Merge pull request #10231 from yonghengdexin735/wip-zzz-paxosserver-type
mon/PaxosService: make the return value type inconsistent

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-08-01 14:25:27 -07:00
Yuri Weinstein
8548a1e9bc Merge pull request #10340 from yuyuyu101/wip-16715
msg/async/AsyncConnection: replace Mutex with std::mutex for peformance

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-08-01 14:22:55 -07:00