Commit Graph

56553 Commits

Author SHA1 Message Date
Venky Shankar
226a5d2070 journaler: implement asynchronous remove()
Signed-off-by: Venky Shankar <vshankar@redhat.com>
2016-08-07 16:31:37 +05:30
Venky Shankar
0dfbadda45 journaler: implement asynchronous exists()
Signed-off-by: Venky Shankar <vshankar@redhat.com>
2016-08-07 16:31:36 +05:30
Venky Shankar
c0848e262d journaler: asynchronous JournalTrimmer::remove_objects()
Asynchronous removal of journal objects for a given rbd image.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
2016-08-07 16:31:36 +05:30
Venky Shankar
1416f1c3bc librbd / ImageCtx: singleton safetimer instance helper
Signed-off-by: Venky Shankar <vshankar@redhat.com>
2016-08-07 16:31:36 +05:30
Venky Shankar
21e6573d49 librbd / ImageCtx: singleton thread pool instance helper
Introduce static member function in ImageCtx to fetch (and
initialize) singleton thread pool.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
2016-08-07 16:31:36 +05:30
Mykola Golub
89a37496e7 Merge pull request #10574 from dillaman/wip-16923
librbd: delay acquiring lock if image watch has failed

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-08-07 13:33:45 +03:00
Mykola Golub
8f8b92f3a1 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>
2016-08-07 13:33:01 +03:00
Matt Benjamin
41af3bb45e Merge pull request #10579 from dreamhost/wip-16928
rgw: Fix civetweb IPv6

verified:  autobuild
2016-08-05 15:26:57 -04:00
Matt Benjamin
b84046b936 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)
2016-08-05 15:02:55 -04:00
Pritha Srivastava
c7dae89016 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>
2016-08-05 22:47:07 +05:30
Jason Dillaman
b0b1a8b438 Merge pull request #10595 from tchaikov/wip-rocksdb
rocksdb: revert the change introduced by dc41731

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-08-05 11:41:00 -04:00
Kefu Chai
1e1f65e032 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>
2016-08-05 23:33:58 +08:00
Yuri Weinstein
8175ce07b8 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>
2016-08-05 08:22:39 -07:00
Yuri Weinstein
bb7424e860 Merge pull request #10491 from xiexingguo/xxg-wip-osdmon-2016-07-28
osd/OSDMonitor: misc. fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-08-05 08:14:02 -07:00
Yuri Weinstein
23e731807c 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>
2016-08-05 08:12:29 -07:00
Casey Bodley
e0e25dd99d Merge pull request #10593 from linuxbox2/ldap-bindv3-again
rgw ldap: enforce simple_bind w/LDAPv3

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-08-05 11:11:36 -04:00
Yuri Weinstein
4075f98da1 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>
2016-08-05 08:09:58 -07:00
Yuri Weinstein
6a1f5a294a Merge pull request #10392 from stiopaa1/mon_monclient_moveCCancelMonCommand
mon/MonClient: move C_CancelMonCommand to cc file

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-08-05 08:09:07 -07:00
Yuri Weinstein
8fd699c5c5 Merge pull request #10470 from xiexingguo/xxg-wip-osd-2016-07-28
osd: minor performance improvements

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-08-05 08:08:19 -07:00
John Spray
e688f5f80e 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>
2016-08-05 15:55:56 +01:00
Matt Benjamin
08d5429143 rgw ldap: enforce simple_bind w/LDAPv3
Found by Harald Klein <hklein@redhat.com>.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-08-05 10:38:39 -04:00
Jason Dillaman
8865846f27 Merge pull request #10542 from ktdreyer/doc-rbd-libvirt-logging
doc: describe libvirt client logging

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-08-05 09:52:06 -04:00
Jason Dillaman
efa5f730cc Merge pull request #10488 from lande1234/wip-lan-testing
rbd-mirror: add additional test scenarios

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-08-05 09:20:37 -04:00
John Spray
4a648d2d4a Merge pull request #10573 from renhwztetecs/renhw-wip-doc-cephfs
doc/mds: fixup mds doc

Reviewed-by: John Spray <john.spray@redhat.com>
2016-08-05 12:26:21 +01:00
John Spray
9d84634d9a 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>
2016-08-05 12:22:53 +01:00
John Spray
6e34969b8f 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>
2016-08-05 12:22:53 +01:00
John Spray
8aeec4cf0d Merge pull request #10512 from renhwztetecs/renhw-wip-mds-balancer
mds/MDBalancer: cleanup

Reviewed-by: John Spray <john.spray@redhat.com>
2016-08-05 12:01:12 +01:00
John Spray
019f1cf519 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>
2016-08-05 12:00:05 +01:00
John Spray
4dcae90ed2 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>
2016-08-05 11:59:21 +01:00
John Spray
f6d6bc7cc1 Merge pull request #10540 from jcsp/wip-mds-multimds-standby
mds: fix daemon selection when starting ranks

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-08-05 11:58:32 +01:00
Jason Dillaman
4de7c8d0a7 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>
2016-08-04 20:56:36 -04:00
Robin H. Johnson
921c556b65
rgw: Fix civetweb IPv6
Commit c38e3cbb6f 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>
2016-08-04 17:15:18 -07:00
David Zafman
6fed82a086 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>
2016-08-04 17:01:12 -07:00
Jason Dillaman
b0dbd1ff50 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>
2016-08-04 17:01:57 -04:00
Ken Dreyer
8e8d55b797 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>
2016-08-04 12:30:24 -06:00
Jason Dillaman
dfe9f3eac9 librbd: delay acquiring exclusive lock if watch has failed
Fixes: http://tracker.ceph.com/issues/16923
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-08-04 14:05:19 -04:00
Jason Dillaman
814c305ce8 librbd: convert ImageWatcher class to template
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-08-04 13:49:19 -04:00
John Spray
367cb8407b Merge pull request #10566 from batrick/mds-daemon-unused
mds: remove unused MDSDaemon::objecter

Reviewed-by: John Spray <john.spray@redhat.com>
2016-08-04 14:10:45 +01:00
huanwen ren
d1277f116c doc/mds: add generated files into the /etc/ceph/
Fixes: 16906

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
2016-08-04 20:14:18 +08:00
Patrick Donnelly
50903488d2
mds: remove unused MDSDaemon::objecter
Leftover from a2682edb76.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2016-08-03 22:04:17 -04:00
Matt Benjamin
f62f7abbc1 Merge pull request #10307 from pritha-srivastava/wip_s3_auth_rework
rgw: Rework of s3 LDAP Authentication code.

verified: MS AD
2016-08-03 12:39:26 -04:00
David Zafman
ba88a3aac0 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>
2016-08-02 23:55:41 -07:00
David Zafman
892303cd02 filestore: Clear objects before calling collection_list() again
Signed-off-by: David Zafman <dzafman@redhat.com>
2016-08-02 23:55:35 -07:00
David Zafman
b78c457785 filestore: Improve logging
Signed-off-by: David Zafman <dzafman@redhat.com>
2016-08-02 23:55:28 -07:00
huanwen ren
ff9a5cb2ef 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>
2016-08-03 09:19:51 +08:00
huanwen ren
7905f31d5e mds/MDBalancer: redundance cleanup
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
2016-08-03 09:19:51 +08:00
huanwen ren
7c51349ba7 mds/MDBalancer: some types of definitions are cleanup
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
2016-08-03 09:19:51 +08:00
huanwen ren
5478769753 mds/MDBalancer: add err info when ifstream open failure
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
2016-08-03 09:19:33 +08:00
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