Skip to content

Commit 61061ec

Browse files
committed
make sure we run create-non-backup-data only once
1 parent fd900a0 commit 61061ec

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

release_tester/arangodb/starter/deployments/runner.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,6 @@ def run(self):
285285
self.check_data_impl()
286286

287287
if self.new_installer:
288-
if self.hot_backup:
289-
self.create_non_backup_data()
290288
self.versionstr = "NEW[" + self.new_cfg.version + "] "
291289

292290
self.upgrade_counter += 1
@@ -398,6 +396,7 @@ def test_hotbackup_impl(self):
398396
self.check_data_impl()
399397
if not self.check_non_backup_data():
400398
raise Exception("data created after backup is still there??")
399+
self.create_non_backup_data()
401400

402401
@step
403402
def test_hotbackup_after_upgrade_impl(self):

release_tester/arangodb/starter/manager.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -308,25 +308,26 @@ def get_sync_masters(self):
308308
def get_frontend(self):
309309
"""get the first frontendhost of this starter"""
310310
servers = self.get_frontends()
311-
assert servers, "starter: don't have instances!"
311+
print(repr(self))
312+
assert servers, "starter: don't have instances!" + repr(self)
312313
return servers[0]
313314

314315
def get_dbserver(self):
315316
"""get the first dbserver of this starter"""
316317
servers = self.get_dbservers()
317-
assert servers, "starter: don't have instances!"
318+
assert servers, "starter: don't have instances!" + repr(self)
318319
return servers[0]
319320

320321
def get_agent(self):
321322
"""get the first agent of this starter"""
322323
servers = self.get_agents()
323-
assert servers, "starter: have no instances!"
324+
assert servers, "starter: have no instances!" + repr(self)
324325
return servers[0]
325326

326327
def get_sync_master(self):
327328
"""get the first arangosync master of this starter"""
328329
servers = self.get_sync_masters()
329-
assert servers, "starter: don't have instances!"
330+
assert servers, "starter: don't have instances!" + repr(self)
330331
return servers[0]
331332

332333
def have_this_instance(self, instance):
@@ -695,7 +696,7 @@ def replace_binary_for_upgrade(self, new_install_cfg, relaunch=True):
695696
self.replace_binary_setup_for_upgrade(new_install_cfg)
696697
with step("kill the starter processes of the old version"):
697698
if self.instance is None:
698-
logging.error("StarterManager: don't have an instance!!")
699+
logging.error("StarterManager: don't have an instance!!" + repr(self))
699700
else:
700701
logging.info("StarterManager: Killing my instance [%s]", str(self.instance.pid))
701702
self.kill_instance()
@@ -989,14 +990,14 @@ def get_log_file(self):
989990
def read_db_logfile(self):
990991
"""get the logfile of the dbserver instance"""
991992
server = self.get_dbserver()
992-
assert server.logfile.exists(), "don't have logfile?"
993+
assert server.logfile.exists(), "don't have logfile?" + repr(self)
993994
return server.logfile.read_text(errors="backslashreplace")
994995

995996
@step
996997
def read_agent_logfile(self):
997998
"""get the agent logfile of this instance"""
998999
server = self.get_agent()
999-
assert server.logfile.exists(), "don't have logfile?"
1000+
assert server.logfile.exists(), "don't have logfile?" + repr(self)
10001001
return server.logfile.read_text(errors="backslashreplace")
10011002

10021003
@step

0 commit comments

Comments
 (0)