Merge branch 'main' into main

Signed-off-by: Emmanuel Ferdman <emmanuelferdman@gmail.com>

diff --cc qa/tasks/cephfs/test_mirroring.py
index d136e35b7d909208a031ee31820032bf341ca690,83ea754433bb702de1a6429ae33311419dfbabe4..707bbc806cfaf896e0cfd7ae0d8cde60a55dd62f
--- 1/qa/tasks/cephfs/test_mirroring.py
--- 2/qa/tasks/cephfs/test_mirroring.py
+++ b/qa/tasks/cephfs/test_mirroring.py
@@@ -613,13 -613,13 +613,13 @@@ class TestMirroring(CephFSTestCase)
          second = res[TestMirroring.PERF_COUNTER_KEY_NAME_CEPHFS_MIRROR_PEER][0]
          self.assertGreater(second["counters"]["snaps_synced"], first["counters"]["snaps_synced"])
          self.assertGreater(second["counters"]["last_synced_start"], first["counters"]["last_synced_start"])
-         self.assertGreater(second["counters"]["last_synced_end"], second["counters"]["last_synced_start"])
+         self.assertGreaterEqual(second["counters"]["last_synced_end"], second["counters"]["last_synced_start"])
          self.assertGreater(second["counters"]["last_synced_duration"], 0)
-         self.assertEqual(second["counters"]["last_synced_bytes"], 10737418240) # last_synced_bytes = 10 files of 1024MB size each
 -        self.assertEquals(second["counters"]["last_synced_bytes"], 1048576000) # last_synced_bytes = 10 files of 100MB size each
++        self.assertEqual(second["counters"]["last_synced_bytes"], 1048576000) # last_synced_bytes = 10 files of 1024MB size each
  
          # some more IO
-         for i in range(10):
-             self.mount_a.write_n_mb(os.path.join('d0', f'more_file.{i}'), 1024)
+         for i in range(15):
+             self.mount_a.write_n_mb(os.path.join('d0', f'more_file.{i}'), 100)
  
          time.sleep(60)
  
@@@ -636,9 -636,9 +636,9 @@@
          third = res[TestMirroring.PERF_COUNTER_KEY_NAME_CEPHFS_MIRROR_PEER][0]
          self.assertGreater(third["counters"]["snaps_synced"], second["counters"]["snaps_synced"])
          self.assertGreater(third["counters"]["last_synced_start"], second["counters"]["last_synced_end"])
-         self.assertGreater(third["counters"]["last_synced_end"], third["counters"]["last_synced_start"])
+         self.assertGreaterEqual(third["counters"]["last_synced_end"], third["counters"]["last_synced_start"])
          self.assertGreater(third["counters"]["last_synced_duration"], 0)
-         self.assertEqual(third["counters"]["last_synced_bytes"], 10737418240) # last_synced_bytes = 10 files of 1024MB size each
 -        self.assertEquals(third["counters"]["last_synced_bytes"], 1572864000) # last_synced_bytes = 15 files of 100MB size each
++        self.assertEqual(third["counters"]["last_synced_bytes"], 1572864000) # last_synced_bytes = 10 files of 1024MB size each
  
          # delete a snapshot
          self.mount_a.run_shell(["rmdir", "d0/.snap/snap0"])