Jason Dillaman
d9ee1e7270
rbd-mirror: properly initialize image copy start/end objects
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-29 15:12:29 -04:00
Jason Dillaman
18e849f01c
rbd-mirror: only delete ImageCtx after open failure
...
The image is already closed -- it just needs to be destroyed
in a thread context outside of librbd.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-29 15:12:29 -04:00
Jason Dillaman
cb72ac120c
cls_journal: disallow client registration against missing journal
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-29 15:12:29 -04:00
Jason Dillaman
0b0b2244a0
journal: added helper to query single client record from disk
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-29 15:12:29 -04:00
Jason Dillaman
418b4746a1
rbd-mirror: convert ImageReplayer into templated class
...
This will facilitate create mock test cases.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-29 15:12:29 -04:00
Jason Dillaman
7d10eb01c0
librbd: helper methods to allocate tags associated to remote journals
...
Allocating tags for the local journal will always be based off the local
commit position. For remote journals, the local commit position doesn't
reflect actual events replayed by rbd-mirror, so it needs to provide the
remote journal commit position.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-29 15:12:29 -04:00
Jason Dillaman
0f99d88dc9
rbd-mirror: initial integration with librbd lock/journal policies
...
For the first stage, acquiring the exclusive-lock will no longer
automatically result in the allocation of a journal tag.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-29 15:12:29 -04:00
Jason Dillaman
a9549d6643
librbd: basic policy for journal handling
...
This will allow rbd-mirror to override the allocation of a new
tag and to restart rbd-mirror's image replayer when a watch error
forces the loss of the exclusive lock.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-29 15:12:28 -04:00
Jason Dillaman
38cf63d55c
librbd: optional 'force' parameter for request lock payload
...
This will be used when force promoting an image to primary -- when
rbd-mirror receives the forced request, it will immediately abort
playback.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-29 15:12:28 -04:00
Jason Dillaman
2afb2c31ed
librbd: basic policy for controlling the release of the exclusive lock
...
The rbd-mirror daemon will need to interlock with the request for the lock
from another client with the successful sync of remote journal events.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-29 15:12:28 -04:00
Jason Dillaman
dae789dd2b
librbd: journal type traits should be standalone
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-29 15:12:27 -04:00
Jason Dillaman
e94e779edb
Merge pull request #8332 from rjfd/wip-15267
...
rbd-mirror: prevent enabling/disabling an image's mirroring when not in image mode
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-03-29 15:12:09 -04:00
Sage Weil
88a183bd85
Merge remote-tracking branch 'gh/jewel'
2016-03-29 15:04:16 -04:00
Sage Weil
eff3b08a75
Merge pull request #8320 from dachary/wip-virtualenv-jewel
...
Makefile-env.am: set a default for CEPH_BUILD_VIRTUALENV (part 2)
Reviewed-by: Dan Mick <dmick@redhat.com>
2016-03-29 15:08:54 -04:00
Sage Weil
962c65a48d
Merge pull request #8360 from jdurgin/wip-ceph-python-path
...
ceph.in: correct dev python path for automake builds
Tested-by: Sage Weil <sage@redhat.com>
2016-03-29 15:06:56 -04:00
Josh Durgin
c321c534e4
Merge pull request #8361 from liewegas/wip-test-port
...
test/test_pool_create.sh: fix port
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-29 11:34:54 -07:00
Josh Durgin
ef179eddde
Merge remote-tracking branch 'origin/jewel'
2016-03-29 11:33:02 -07:00
Josh Durgin
5878c8ce9d
Merge pull request #8356 from ceph/wip-cython-build-dir
...
pybind/Makefile.am: Prevent race creating CYTHON_BUILD_DIR
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-29 11:27:10 -07:00
Sage Weil
a21cc54b98
test/test_pool_create.sh: fix port
...
17108 is used by test/mon/test_pool_quota.sh
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-29 14:26:17 -04:00
Sage Weil
fc7942bfd0
Merge pull request #8359 from athanatos/wip-15205
...
os/ObjectStore: try_move_rename in transaction append and add coverage to store_test
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-29 14:22:51 -04:00
Josh Durgin
a041e5c941
ceph.in: correct dev python path for automake builds
...
Accidentally broken by ad2e6f442d
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2016-03-29 11:18:26 -07:00
Samuel Just
9d6de8484b
store_test: apply an appended transaction half the time
...
Signed-off-by: Samuel Just <sjust@redhat.com>
2016-03-29 11:13:53 -07:00
Samuel Just
5bf281e92c
Transaction: handle OP_TRY_RENAME in dump
...
Signed-off-by: Samuel Just <sjust@redhat.com>
2016-03-29 11:13:53 -07:00
Samuel Just
9634cec809
store_test: add a TryMoveRename test
...
Signed-off-by: Samuel Just <sjust@redhat.com>
2016-03-29 11:13:52 -07:00
Samuel Just
eb9e80c94f
ObjectStore::Transaction::_update_op: handle OP_TRY_RENAME
...
Fixes: http://tracker.ceph.com/issues/15205
Signed-off-by: Samuel Just <sjust@redhat.com>
2016-03-29 11:13:35 -07:00
Ricardo Dias
f3ebe4661a
rbd: rbd-mirroring: Updated rbd mirroring unit tests to reflect the new conditions to enable/disable image mirroring
...
Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-03-29 19:05:58 +01:00
Samuel Just
d2beb77760
Merge pull request #6317 from cxwshawn/wip-lost-fix
...
PG: pg down state blocked by osd.x, lost osd.x cannot solve peering stuck
Reviewed-by: Samuel Just <sjust@redhat.com>
2016-03-29 10:56:55 -07:00
Sage Weil
c40d90df06
Merge pull request #8292 from vshankar/bluefs-tool-fix
...
os/bluestore: ceph-bluefs-tool fixes
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-29 13:47:26 -04:00
branto1
8a83ec9904
Merge pull request #8334 from dachary/wip-subman-facts
...
script: subscription-manager support (part 3)
Reviewed-by: Boris Ranto <branto@redhat.com>
2016-03-29 19:37:02 +02:00
Orit Wasserman
48a823b359
Merge pull request #8351 from jcsp/wip-cmake-cython
...
cmake: Build cython modules and change paths to bin/, lib/
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-03-29 18:35:22 +02:00
Ricardo Dias
872b1b1cdc
rbd: rbd-mirroring: Disable image mirroring depends on pool mirroring mode
...
Signed-off-by: Ricardo Dias <rdias@suse.com>
Fixes : #15267
2016-03-29 17:26:53 +01:00
Ricardo Dias
bc254c851c
rbd: rbd-mirroring: Enabling image mirroring depends on pool mirroring mode
...
Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-03-29 17:26:53 +01:00
Loic Dachary
668c8f965e
script: subscription-manager support (part 3)
...
Renaming subman.py in subman is cute but does not prevent the generation
of the py[co].
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-29 18:12:40 +02:00
Samuel Just
b3bc2911c1
Merge pull request #8215 from dzafman/wip-14438
...
Wip 14438
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-29 08:02:41 -07:00
Jason Dillaman
385d973189
Merge pull request #8261 from rjfd/wip-15217
...
rbd-mirror: enabling/disabling pool mirroring should update the mirroring directory
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-03-29 10:22:09 -04:00
John Spray
ad2e6f442d
ceph.in: update for cmake path changes
...
Signed-off-by: John Spray <john.spray@redhat.com>
2016-03-29 13:42:40 +01:00
John Spray
5da6ae8638
vstart: update for cmake build path changes
...
Cribbed this from Ali's wip-cmake-make-check branch.
Signed-off-by: John Spray <john.spray@redhat.com>
2016-03-29 13:42:40 +01:00
Ali Maredia
f02f1d17a6
cmake: Cython modules building with cmake
...
Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-03-29 12:23:31 +01:00
Loic Dachary
43d63ee456
Merge pull request #8228 from SUSE/wip-15218
...
doc/dev: add "Deploy a cluster for manual testing" section
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-03-29 13:01:23 +02:00
Loic Dachary
d24f6f4196
Merge pull request #8256 from dachary/wip-mailmap
...
mailmap updates
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
2016-03-29 12:58:56 +02:00
Loic Dachary
44bbdb6b0c
mailmap: Adam C. Emerson name normalization
...
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-29 12:57:56 +02:00
Loic Dachary
4a6f8b300f
mailmap: Jenkins name normalization
...
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-29 12:57:56 +02:00
Loic Dachary
24d6c9a80b
mailmap: Yan Jun affiliation
...
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-29 12:57:56 +02:00
Loic Dachary
64eaea2b70
mailmap: Zhao Junwang affiliation
...
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-29 12:57:56 +02:00
Loic Dachary
69d9a4b33b
mailmap: Sarthak Munshi affiliation
...
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-29 12:57:56 +02:00
Loic Dachary
c502ee1234
mailmap: Rust Shen affiliation
...
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-29 12:57:55 +02:00
Loic Dachary
3205e0c000
mailmap: Eric Cook affiliation
...
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-29 12:57:55 +02:00
Loic Dachary
8445255f14
mailmap: Ricardo Dias affiliation
...
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-29 12:57:55 +02:00
Loic Dachary
5bbfa8adaf
mailmap: Karol Mroz affiliation
...
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-29 12:57:55 +02:00
Loic Dachary
83cd4034cc
mailmap: James Liu affiliation
...
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-29 12:57:55 +02:00