tests/migrations: make logging more consistent

bashtanov · Sep 16, 2024 · 3558630 · 3558630
1 parent a273fc7
commit 3558630
Showing 1 changed file with 1 addition and 12 deletions.
diff --git a/tests/rptest/tests/data_migrations_api_test.py b/tests/rptest/tests/data_migrations_api_test.py
@@ -134,6 +134,7 @@ def migration_in_one_of_states():
             return self.on_all_live_nodes(
                 id, lambda m: m is not None and m["state"] in states)
 
+        self.logger.info(f'waiting for {" or ".join(states)}')
         wait_until(
             migration_in_one_of_states,
             timeout_sec=90,
@@ -238,21 +239,16 @@ def test_creating_and_listing_migrations(self):
 
             admin.execute_data_migration_action(out_migration_id,
                                                 MigrationAction.prepare)
-            self.logger.info('waiting for preparing or prepared')
             self.wait_for_migration_states(out_migration_id,
                                            ['preparing', 'prepared'])
-            self.logger.info('waiting for prepared')
             self.wait_for_migration_states(out_migration_id, ['prepared'])
             admin.execute_data_migration_action(out_migration_id,
                                                 MigrationAction.execute)
-            self.logger.info('waiting for executing or executed')
             self.wait_for_migration_states(out_migration_id,
                                            ['executing', 'executed'])
-            self.logger.info('waiting for executed')
             self.wait_for_migration_states(out_migration_id, ['executed'])
             admin.execute_data_migration_action(out_migration_id,
                                                 MigrationAction.finish)
-            self.logger.info('waiting for cut_over or finished')
             self.wait_for_migration_states(out_migration_id,
                                            ['cut_over', 'finished'])
             self.wait_for_migration_states(out_migration_id, ['finished'])
@@ -287,21 +283,16 @@ def test_creating_and_listing_migrations(self):
 
             admin.execute_data_migration_action(in_migration_id,
                                                 MigrationAction.prepare)
-            self.logger.info('waiting for preparing or prepared')
             self.wait_for_migration_states(in_migration_id,
                                            ['preparing', 'prepared'])
-            self.logger.info('waiting for prepared')
             self.wait_for_migration_states(in_migration_id, ['prepared'])
             admin.execute_data_migration_action(in_migration_id,
                                                 MigrationAction.execute)
-            self.logger.info('waiting for executing or executed')
             self.wait_for_migration_states(in_migration_id,
                                            ['executing', 'executed'])
-            self.logger.info('waiting for executed')
             self.wait_for_migration_states(in_migration_id, ['executed'])
             admin.execute_data_migration_action(in_migration_id,
                                                 MigrationAction.finish)
-            self.logger.info('waiting for cut_over or finished')
             self.wait_for_migration_states(in_migration_id,
                                            ['cut_over', 'finished'])
             self.wait_for_migration_states(in_migration_id, ['finished'])
@@ -506,7 +497,6 @@ def cancel(self, migration_id, topic_name):
         admin = Admin(self.redpanda)
         admin.execute_data_migration_action(migration_id,
                                             MigrationAction.cancel)
-        self.logger.info('waiting for cancelled')
         self.wait_for_migration_states(migration_id, ['cancelled'])
         admin.delete_data_migration(migration_id)
 
@@ -718,7 +708,6 @@ def test_migrated_topic_data_integrity(self, transfer_leadership: bool,
                 admin.execute_data_migration_action(in_migration_id,
                                                     MigrationAction.finish)
 
-                self.logger.info('waiting for finished')
                 self.wait_for_migration_states(in_migration_id, ['finished'])
                 admin.delete_data_migration(in_migration_id)
                 # now the topic should be fully operational