github/open-cas-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1305 from arutk/drbdcmf

Browse Source 
Update DRBD API usage (create-md requires force param)
This commit is contained in:
Michał Mielewczyk 2022-08-12 08:39:32 +02:00 committed by GitHub
commit f82719231d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/functional/tests/example/example_test.py
View File

@ -199,12 +199,12 @@ def test_drbd_example():
with TestRun.use_dut(dut1), TestRun.step(f"Create a DRBD instance on {dut1}"): with TestRun.use_dut(dut1), TestRun.step(f"Create a DRBD instance on {dut1}"):
primary = Drbd(caches) primary = Drbd(caches)
primary.create_metadata() primary.create_metadata(force=True)
primary.up() primary.up()
with TestRun.use_dut(dut2), TestRun.step(f"Create a DRBD instance on {dut2}"): with TestRun.use_dut(dut2), TestRun.step(f"Create a DRBD instance on {dut2}"):
secondary = Drbd(caches) secondary = Drbd(caches)
secondary.create_metadata() secondary.create_metadata(force=True)
secondary.up() secondary.up()
with TestRun.use_dut(dut1), TestRun.step(f"Set {dut1} as primary node"): with TestRun.use_dut(dut1), TestRun.step(f"Set {dut1} as primary node"):

10
test/functional/tests/failover_standby/test_failover_multihost.py
View File

@ -114,12 +114,12 @@ def test_functional_activate_twice_round_trip(filesystem):
with TestRun.use_dut(dut), TestRun.step(f"Create DRBD instances on {dut.ip}"): with TestRun.use_dut(dut), TestRun.step(f"Create DRBD instances on {dut.ip}"):
caches_original_resource.save() caches_original_resource.save()
dut.cache_drbd = Drbd(caches_original_resource) dut.cache_drbd = Drbd(caches_original_resource)
dut.cache_drbd.create_metadata() dut.cache_drbd.create_metadata(force=True)
dut.cache_drbd_dev = dut.cache_drbd.up() dut.cache_drbd_dev = dut.cache_drbd.up()
cores_resource.save() cores_resource.save()
dut.core_drbd = Drbd(cores_resource) dut.core_drbd = Drbd(cores_resource)
dut.core_drbd.create_metadata() dut.core_drbd.create_metadata(force=True)
dut.core_drbd_dev = dut.core_drbd.up() dut.core_drbd_dev = dut.core_drbd.up()
with TestRun.use_dut(primary_node), TestRun.step( with TestRun.use_dut(primary_node), TestRun.step(
@ -284,12 +284,12 @@ def test_functional_activate_twice_new_host(filesystem):
with TestRun.use_dut(dut), TestRun.step(f"Create DRBD instances on {dut.ip}"): with TestRun.use_dut(dut), TestRun.step(f"Create DRBD instances on {dut.ip}"):
caches_original_resource.save() caches_original_resource.save()
dut.cache_drbd = Drbd(caches_original_resource) dut.cache_drbd = Drbd(caches_original_resource)
dut.cache_drbd.create_metadata() dut.cache_drbd.create_metadata(force=True)
dut.cache_drbd_dev = dut.cache_drbd.up() dut.cache_drbd_dev = dut.cache_drbd.up()
cores_resource.save() cores_resource.save()
dut.core_drbd = Drbd(cores_resource) dut.core_drbd = Drbd(cores_resource)
dut.core_drbd.create_metadata() dut.core_drbd.create_metadata(force=True)
dut.core_drbd_dev = dut.core_drbd.up() dut.core_drbd_dev = dut.core_drbd.up()
with TestRun.use_dut(primary_node), TestRun.step( with TestRun.use_dut(primary_node), TestRun.step(
@ -556,6 +556,6 @@ def new_failover_instance(new_secondary_node, drbd_resource, *, autoload):
): ):
drbd_resource.save() drbd_resource.save()
if not autoload: if not autoload:
new_secondary_node.cache_drbd.create_metadata() new_secondary_node.cache_drbd.create_metadata(force=True)
new_secondary_node.cache_drbd = Drbd(drbd_resource) new_secondary_node.cache_drbd = Drbd(drbd_resource)
new_secondary_node.cache_drbd_dev = new_secondary_node.cache_drbd.up() new_secondary_node.cache_drbd_dev = new_secondary_node.cache_drbd.up()