Commit Graph

51158 Commits

Author SHA1 Message Date
Matt Benjamin
1539d9029c rgw-ldap: conditional build
Permit building without LDAP support--support is enabled by default.
Tested with CMake and autotools standalone builds.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-03-16 16:31:20 -04:00
Matt Benjamin
a0289893c0 rgw ldap: s/memberattr/dnattr/;
The parameter really is dnattr (attribute used to form DNs), not
memberattr (attribute used to form group member strings).

Switch to the correct name for this attribute, to avoid confusion--
especially if we ever apply group membership checks in future.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-03-15 18:00:55 -04:00
Samuel Just
8d10fdfb5e Merge pull request #7631 from liewegas/wip-agent-flush-low
osd: consider high/low mode when putting agent to sleep

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-03-15 12:58:48 -07:00
Gregory Farnum
fcce59e46d Merge pull request #7713 from ukernel/wip-filelock-deadlock
Wip filelock deadlock

Reviewed-by: John Spray <john.spray@redhat.com>
2016-03-15 12:25:56 -07:00
Sage Weil
7fb0fe568d Merge pull request #8136 from athanatos/wip-split-lfn
osd: filestore: fix race condition with split vs collection_move_rename and long object names

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-15 14:16:22 -04:00
Josh Durgin
5f85c6901c Merge pull request #8132 from dillaman/wip-librbd-memcheck
librbd: correct issues discovered via valgrind memcheck

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-15 10:10:09 -07:00
Jason Dillaman
921409f721 journal: reschedule watch if no entries available during live replay
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-15 12:39:10 -04:00
Jason Dillaman
4c42b95eb9 librbd: correct valgrind memcheck errors
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-15 12:27:04 -04:00
Ken Dreyer
2abcab005c Merge pull request #8120 from SUSE/wip-15138
RPM: fix openldap and openssl build dependencies for SUSE

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Jun Huang <hjwsm1989@gmail.com>
2016-03-15 09:24:25 -06:00
Sage Weil
d5c5085064 Merge pull request #8114 from liewegas/wip-tmap-migrate
qa/workunits/rados/test.sh: test tmap_migrate
2016-03-15 11:21:12 -04:00
Josh Durgin
0b70ad420c Merge pull request #8119 from dillaman/wip-qa-rbd-copy
rbd: clone operation should default to image format 2

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-15 08:21:05 -07:00
Josh Durgin
129d83b84f Merge pull request #8090 from trociny/fixup-rbd-mirror-test
test: fixup and improvements for rbd-mirror test

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-15 08:20:43 -07:00
Josh Durgin
10d4b0bbe0 Merge pull request #8129 from dillaman/wip-qa-rbd-permissions
test: fix issues discovered via the rbd permissions test case

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-15 08:18:25 -07:00
Josh Durgin
09143ea797 Merge pull request #8124 from dillaman/wip-qa-rbd-lock-fence
test: handle exception thrown from close during rbd lock test

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-15 08:17:21 -07:00
Jason Dillaman
36af39cdf4 qa/workunits/rbd: disable deep-flatten during permissions testing
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-15 11:05:02 -04:00
Jason Dillaman
8a7249196b rbd: snap list should open image as read-only
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-15 10:57:48 -04:00
Sage Weil
35e6b76f80 Merge remote-tracking branch 'gh/jewel' 2016-03-15 10:44:15 -04:00
Sage Weil
173a0058ce Merge pull request #7243 from tchaikov/wip-py3-jewel
ceph-detect-init: fix py3 test

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-15 10:48:41 -04:00
Kefu Chai
f9bc07a616 Merge pull request #7975 from JiYou/fix-config-opts
config: fix osd_crush_initial_weight

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-15 22:17:57 +08:00
Sage Weil
af47d7a402 Merge pull request #8125 from dillaman/wip-librbd-mock
test: add missing shut_down mock method
2016-03-15 10:17:03 -04:00
Jason Dillaman
31f9454469 test: add missing shut_down mock method
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-15 10:11:53 -04:00
Jason Dillaman
2ae1be4259 qa/workunits/rbd: handle exception thrown from close during lock test
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-15 09:59:13 -04:00
Nathan Cutler
3214ae99f7 RPM: fix openldap and openssl build dependencies for SUSE
http://tracker.ceph.com/issues/15138 Fixes: #15138

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-03-15 14:46:54 +01:00
Jason Dillaman
0b6a4c8e7c rbd: clone operation should default to image format 2
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-15 09:45:21 -04:00
Loic Dachary
0a92973bec Merge pull request #8116 from SUSE/wip-docdev-nuke
doc/dev: add section on interrupting a running suite

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-03-15 14:25:38 +01:00
Nathan Cutler
917e06b8e2 doc/dev: add section on interrupting a running suite
This commit adds a new section, entitled "Interrupt a running suite", to
the "Testing in the cloud" chapter.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-03-15 14:14:09 +01:00
Sage Weil
fcfdfec774 Merge pull request #8105 from SUSE/wip-ceph-detect-init-tox
ceph-detect-init: add missing test case
2016-03-15 09:12:24 -04:00
Sage Weil
3866acaa40 Merge pull request #8088 from liewegas/wip-typo
osd/OSDMap: fix typo in summarize_mapping_stats

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-15 09:08:55 -04:00
Sage Weil
4c2997e82f Merge pull request #8098 from liewegas/wip-fix-crush
unittest_osdmap: default crush tunables now firefly
2016-03-15 09:00:33 -04:00
Sage Weil
bb9ce60755 Merge pull request #8089 from liewegas/wip-mark-pg-stale
mon/PGMonitor: reliably mark PGs state

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-15 09:00:06 -04:00
Sage Weil
c55de00382 Merge pull request #7943 from llua/init-ceph
init-ceph.in: allow case-insensitive true in `osd crush update on start'

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
2016-03-15 08:52:30 -04:00
Sage Weil
c2078130be Merge pull request #8055 from liewegas/wip-hobject
ghobject_t: use # instead of ! as a separator

Reviewed-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
2016-03-15 08:40:14 -04:00
Jason Dillaman
e6816f3815 Merge pull request #8056 from rjfd/wip-13296
rbd: support for enabling/disabling mirroring on specific images

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-03-15 08:39:44 -04:00
Sage Weil
22fe493268 qa/workunits/rados/test.sh: test tmap_migrate
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-15 08:38:05 -04:00
Sage Weil
15fc71adae Merge pull request #7971 from ceph/wip-selinux-update
selinux: Update policy to grant additional access
2016-03-15 08:38:01 -04:00
Sage Weil
17f810573c Merge pull request #8033 from liewegas/wip-pg-create
osd: handle dup pg_create that races with pg deletion

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-03-15 08:35:36 -04:00
Sage Weil
c0d6c48e88 Merge pull request #8054 from ErwanAliasr1/evelu-check
common: SubProcess: Avoid buffer corruption when calling err()

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-15 08:35:06 -04:00
Sage Weil
34ff39fa2f Merge pull request #8057 from liewegas/wip-pglog-warning
osd/PGLog: fix warning

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-03-15 08:34:29 -04:00
Sage Weil
b9c1f50857 Merge pull request #8059 from ceph/wip-include-scope
rados: add ceph:: namespace to bufferlist type

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-15 08:34:09 -04:00
Sage Weil
cbcff08255 Merge pull request #8071 from xiexingguo/xxg-wip-fixptr
osd: initialize last_recalibrate field at construction

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-15 08:33:42 -04:00
Sage Weil
1cef67959c Merge pull request #8081 from renhwsky/renhw-wip-osdmonitor-poolset
osd: min_write_recency_for_promote & min_read_recency_for_promote are tiering only

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-15 08:33:13 -04:00
Mykola Golub
8e41220d34 test: fixup and improvements for rbd-mirror test
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-03-15 10:18:33 +02:00
Kefu Chai
5e82bb26b0 Merge pull request #7879 from xiexingguo/xxg-wip-doc-rados-api
doc/rados/api/librados-intro.rst: fix typo

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
2016-03-15 14:44:24 +08:00
xie xingguo
01db964f4e doc: fix typo
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-03-15 14:38:05 +08:00
Josh Durgin
e420dc723f Merge pull request #8079 from dillaman/wip-14413
rbd-mirror: integrate with image sync state machine

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-14 17:27:30 -07:00
Jason Dillaman
a60f38df61 test: remove broken negative test cases
These should be reimplemented using google mock instead of
virtual functions.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-14 17:26:20 -07:00
Jason Dillaman
24e50a1e24 rbd-mirror: integrate new bootstrap state machine
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-14 17:26:18 -07:00
Jason Dillaman
e1fa689977 rbd-mirror: simple image bootstrap state machine
This state machine will handle the simple cases of creating
a local image from a remote image, registering to the remote
journal, and sync'ing the image contents.

There are several TODOs for future remaining work.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-14 17:26:16 -07:00
Jason Dillaman
3b1db9bbf5 rbd-mirror: helper state machine for opening local image
This state machine will open a local image and request the
exclusive lock.  If the open or lock fails, it will automatically
close the image.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-14 17:26:14 -07:00
Jason Dillaman
d61293d4da rbd-mirror: helper state machine for closing librbd images
librbd ImageCtx's cannot be deleted from within the librbd thread.  This
state machine will perform the deletion from the rbd-mirror work queue
thread.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-14 17:26:08 -07:00