Merge pull request #1008 from aschnell/master

- add additional udevadm settle call
openSUSE · Jan 23, 2025 · 6f99410 · 6f99410
2 parents f8bfd58 + 25dd050
commit 6f99410
Show file tree

Hide file tree

Showing 22 changed files with 43 additions and 37 deletions.
diff --git a/integration-tests/bcache/delete.py b/integration-tests/bcache/delete.py
@@ -19,13 +19,13 @@
 print(staging)
 
 sdc1 = Partition.find_by_name(staging, "/dev/sdc1")
-sdc1.remove_descendants()
+sdc1.remove_descendants(View_REMOVE)
 
 sdc2 = Partition.find_by_name(staging, "/dev/sdc2")
-sdc2.remove_descendants()
+sdc2.remove_descendants(View_REMOVE)
 
 sdd1 = Partition.find_by_name(staging, "/dev/sdd1")
-sdd1.remove_descendants()
+sdd1.remove_descendants(View_REMOVE)
 
 print(staging)
 

diff --git a/integration-tests/filesystems/btrfs/multiple-devices/delete.py b/integration-tests/filesystems/btrfs/multiple-devices/delete.py
@@ -19,7 +19,7 @@
 print(staging)
 
 sdc1 = Partition.find_by_name(staging, "/dev/sdc1")
-sdc1.remove_descendants()
+sdc1.remove_descendants(View_REMOVE)
 
 print(staging)
 

diff --git a/integration-tests/filesystems/delete-nfs.py b/integration-tests/filesystems/delete-nfs.py
@@ -20,7 +20,7 @@
 
 nfs = Nfs.find_by_server_and_path(staging, "dist", "/dist")
 
-nfs.remove_descendants()
+nfs.remove_descendants(View_REMOVE)
 staging.remove_device(nfs)
 
 print(staging)

diff --git a/integration-tests/filesystems/delete-tmpfs.py b/integration-tests/filesystems/delete-tmpfs.py
@@ -27,7 +27,7 @@
         mount_point = tmpfs.get_mount_point()
 
         if mount_point.get_path() == "/test":
-            tmpfs.remove_descendants()
+            tmpfs.remove_descendants(View_REMOVE)
             staging.remove_device(tmpfs)
 
 print(staging)

diff --git a/integration-tests/lvm/create-complete.py b/integration-tests/lvm/create-complete.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-# requirements: disk /dev/sdb with empty partitions sdb1 and sdb2
+# requirements: disk /dev/sdc with empty partitions sdc1 and sdd1
 
 
 from sys import exit
@@ -17,12 +17,12 @@
 
 staging = storage.get_staging()
 
-sdb1 = Partition.find_by_name(staging, "/dev/sdb1")
-sdb2 = Partition.find_by_name(staging, "/dev/sdb2")
+sdc1 = Partition.find_by_name(staging, "/dev/sdc1")
+sdd1 = Partition.find_by_name(staging, "/dev/sdd1")
 
 test = LvmVg.create(staging, "test")
-test.add_lvm_pv(sdb1)
-test.add_lvm_pv(sdb2)
+test.add_lvm_pv(sdc1)
+test.add_lvm_pv(sdd1)
 
 test.create_lvm_lv("1", LvType_NORMAL, 1 * GiB)
 test.create_lvm_lv("2", LvType_NORMAL, 1 * GiB)

diff --git a/integration-tests/lvm/create-vg.py b/integration-tests/lvm/create-vg.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-# requirements: empty partitions sdb1 and sdc1
+# requirements: empty partitions sdc1 and sdd1
 
 
 from sys import exit
@@ -17,12 +17,12 @@
 
 staging = storage.get_staging()
 
-sdb1 = Partition.find_by_name(staging, "/dev/sdb1")
 sdc1 = Partition.find_by_name(staging, "/dev/sdc1")
+sdd1 = Partition.find_by_name(staging, "/dev/sdd1")
 
 test = LvmVg.create(staging, "test")
-test.add_lvm_pv(sdb1)
 test.add_lvm_pv(sdc1)
+test.add_lvm_pv(sdd1)
 test.set_extent_size(128 * MiB)
 
 print(staging)

diff --git a/integration-tests/lvm/delete-complete.py b/integration-tests/lvm/delete-complete.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-# requirements: disk /dev/sdb with lvm on partition sdb1 and sdb2
+# requirements: disk /dev/sdc with lvm on partition sdc1 and sdd1
 
 
 from sys import exit
@@ -17,11 +17,11 @@
 
 staging = storage.get_staging()
 
-sdb1 = Partition.find_by_name(staging, "/dev/sdb1")
-sdb1.remove_descendants()
+sdc1 = Partition.find_by_name(staging, "/dev/sdc1")
+sdc1.remove_descendants(View_REMOVE)
 
-sdb2 = Partition.find_by_name(staging, "/dev/sdb2")
-sdb2.remove_descendants()
+sdd1 = Partition.find_by_name(staging, "/dev/sdd1")
+sdd1.remove_descendants(View_REMOVE)
 
 print(staging)
 

diff --git a/integration-tests/lvm/resize-info-pv.py b/integration-tests/lvm/resize-info-pv.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-# requirements: lvm vg test with physical volume /dev/sdb1
+# requirements: lvm vg test with physical volume /dev/sdc1
 
 
 from sys import exit
@@ -19,9 +19,9 @@
 
 print(probed)
 
-sdb1 = BlkDevice.find_by_name(probed, "/dev/sdb1")
+sdc1 = BlkDevice.find_by_name(probed, "/dev/sdc1")
 
-resize_info = sdb1.detect_resize_info()
+resize_info = sdc1.detect_resize_info()
 
 print(resize_info)
 

diff --git a/integration-tests/md/delete-named.py b/integration-tests/md/delete-named.py
@@ -18,7 +18,7 @@
 
 md_test = Md.find_by_name(staging, "/dev/md/test")
 
-md_test.remove_descendants()
+md_test.remove_descendants(View_REMOVE)
 staging.remove_device(md_test)
 
 print(staging)

diff --git a/integration-tests/md/delete.py b/integration-tests/md/delete.py
@@ -18,7 +18,7 @@
 
 md0 = Md.find_by_name(staging, "/dev/md0")
 
-md0.remove_descendants()
+md0.remove_descendants(View_REMOVE)
 staging.remove_device(md0)
 
 print(staging)

diff --git a/integration-tests/mount-points/delete.py b/integration-tests/mount-points/delete.py
@@ -24,7 +24,7 @@
 
 for descendant in blk_filesystem.get_descendants(False):
     if is_mount_point(descendant):
-        blk_filesystem.remove_descendants()
+        blk_filesystem.remove_descendants(View_REMOVE)
 
 print(staging)
 

diff --git a/integration-tests/partition-tables/create-dasd.py b/integration-tests/partition-tables/create-dasd.py
@@ -25,7 +25,7 @@
 
 partitionable = Partitionable.find_by_name(staging, "/dev/dasdb")
 
-partitionable.remove_descendants()
+partitionable.remove_descendants(View_REMOVE)
 
 partitionable.create_partition_table(PtType_DASD)
 

diff --git a/integration-tests/partition-tables/create-gpt.py b/integration-tests/partition-tables/create-gpt.py
@@ -20,7 +20,7 @@
 
 partitionable = Partitionable.find_by_name(staging, "/dev/sdc")
 
-partitionable.remove_descendants()
+partitionable.remove_descendants(View_REMOVE)
 
 partitionable.create_partition_table(PtType_GPT)
 

diff --git a/integration-tests/partition-tables/create-implicit.py b/integration-tests/partition-tables/create-implicit.py
@@ -20,7 +20,7 @@
 
 partitionable = Partitionable.find_by_name(staging, "/dev/dasdb")
 
-partitionable.remove_descendants()
+partitionable.remove_descendants(View_REMOVE)
 
 partitionable.create_partition_table(PtType_IMPLICIT)
 

diff --git a/integration-tests/partition-tables/create-msdos.py b/integration-tests/partition-tables/create-msdos.py
@@ -20,7 +20,7 @@
 
 partitionable = Partitionable.find_by_name(staging, "/dev/sdc")
 
-partitionable.remove_descendants()
+partitionable.remove_descendants(View_REMOVE)
 
 partitionable.create_partition_table(PtType_MSDOS)
 

diff --git a/integration-tests/partition-tables/delete.py b/integration-tests/partition-tables/delete.py
@@ -20,7 +20,7 @@
 
 partitionable = Partitionable.find_by_name(staging, "/dev/sdc")
 
-partitionable.remove_descendants()
+partitionable.remove_descendants(View_REMOVE)
 
 # print(staging)
 

diff --git a/integration-tests/plain-encryption/delete.py b/integration-tests/plain-encryption/delete.py
@@ -19,7 +19,7 @@
 
 sdc1 = Partition.find_by_name(staging, "/dev/sdc1")
 
-sdc1.remove_descendants()
+sdc1.remove_descendants(View_REMOVE)
 
 print(staging)
 

diff --git a/storage/Devices/MdImpl.cc b/storage/Devices/MdImpl.cc
@@ -610,6 +610,8 @@ namespace storage
     void
     Md::Impl::probe_uuid()
     {
+	udev_settle();
+
 	// Note: The UUID reported by mdadm has a different format than reported by
 	// e.g. blkid.
 

diff --git a/storage/Filesystems/Btrfs.h b/storage/Filesystems/Btrfs.h
@@ -270,8 +270,8 @@ namespace storage
 	 */
 	static std::vector<const Btrfs*> get_all(const Devicegraph* devicegraph);
 
-	bool get_configure_snapper() const;
-	void set_configure_snapper(bool configure);
+	bool get_configure_snapper() const ST_DEPRECATED;
+	void set_configure_snapper(bool configure) ST_DEPRECATED;
 
     public:
 

diff --git a/storage/Utils/Udev.h b/storage/Utils/Udev.h
@@ -44,7 +44,11 @@ namespace storage
 
     public:
 
+	/**
+	 * Settle iff flag is set.
+	 */
 	void settle();
+
 	void set_settle_needed();
 
     private:

diff --git a/testsuite/CompoundAction/bcache-sentence.cc b/testsuite/CompoundAction/bcache-sentence.cc
@@ -64,7 +64,7 @@ namespace storage
                 bcache0 = disk0->create_bcache( "/dev/bcache0" );
 
 		if(cset)
-		    bcache0->add_bcache_cset( cset0 );
+		    bcache0->attach_bcache_cset(cset0);
             }
 
 
@@ -74,7 +74,7 @@ namespace storage
                 bcache1 = disk1->create_bcache( "/dev/bcache1" );
 
 		if(cset)
-		    bcache1->add_bcache_cset( cset1 );
+		    bcache1->attach_bcache_cset(cset1);
             }
 
 	    Disk* disk0 = nullptr;

diff --git a/testsuite/bcache1.cc b/testsuite/bcache1.cc
@@ -59,7 +59,7 @@ BOOST_AUTO_TEST_CASE(reassign_numbers)
 }
 
 
-BOOST_AUTO_TEST_CASE(remove_bcache_cset)
+BOOST_AUTO_TEST_CASE(detach_bcache_cset)
 {
     Environment environment(true, ProbeMode::READ_DEVICEGRAPH, TargetMode::DIRECT);
     environment.set_devicegraph_filename("probe/bcache1-devicegraph.xml");
@@ -76,7 +76,7 @@ BOOST_AUTO_TEST_CASE(remove_bcache_cset)
     BOOST_CHECK_EQUAL(bcache1->has_bcache_cset(), true);
     BOOST_CHECK_EQUAL(bcache2->has_bcache_cset(), true);
 
-    bcache1->remove_bcache_cset();
+    bcache1->detach_bcache_cset();
 
     BOOST_CHECK_EQUAL(bcache1->has_bcache_cset(), false);
     BOOST_CHECK_EQUAL(bcache2->has_bcache_cset(), true);