Skip to content

Commit 99d0e88

Browse files
committed
make sure we run create-non-backup-data only once
1 parent 6464702 commit 99d0e88

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
@@ -313,25 +313,26 @@ def get_sync_masters(self):
313313
def get_frontend(self):
314314
"""get the first frontendhost of this starter"""
315315
servers = self.get_frontends()
316-
assert servers, "starter: don't have instances!"
316+
print(repr(self))
317+
assert servers, "starter: don't have instances!" + repr(self)
317318
return servers[0]
318319

319320
def get_dbserver(self):
320321
"""get the first dbserver of this starter"""
321322
servers = self.get_dbservers()
322-
assert servers, "starter: don't have instances!"
323+
assert servers, "starter: don't have instances!" + repr(self)
323324
return servers[0]
324325

325326
def get_agent(self):
326327
"""get the first agent of this starter"""
327328
servers = self.get_agents()
328-
assert servers, "starter: have no instances!"
329+
assert servers, "starter: have no instances!" + repr(self)
329330
return servers[0]
330331

331332
def get_sync_master(self):
332333
"""get the first arangosync master of this starter"""
333334
servers = self.get_sync_masters()
334-
assert servers, "starter: don't have instances!"
335+
assert servers, "starter: don't have instances!" + repr(self)
335336
return servers[0]
336337

337338
def have_this_instance(self, instance):
@@ -701,7 +702,7 @@ def replace_binary_for_upgrade(self, new_install_cfg, relaunch=True):
701702
self.replace_binary_setup_for_upgrade(new_install_cfg)
702703
with step("kill the starter processes of the old version"):
703704
if self.instance is None:
704-
logging.error("StarterManager: don't have an instance!!")
705+
logging.error("StarterManager: don't have an instance!!" + repr(self))
705706
else:
706707
logging.info("StarterManager: Killing my instance [%s]", str(self.instance.pid))
707708
self.kill_instance()
@@ -995,14 +996,14 @@ def get_log_file(self):
995996
def read_db_logfile(self):
996997
"""get the logfile of the dbserver instance"""
997998
server = self.get_dbserver()
998-
assert server.logfile.exists(), "don't have logfile?"
999+
assert server.logfile.exists(), "don't have logfile?" + repr(self)
9991000
return server.logfile.read_text(errors="backslashreplace")
10001001

10011002
@step
10021003
def read_agent_logfile(self):
10031004
"""get the agent logfile of this instance"""
10041005
server = self.get_agent()
1005-
assert server.logfile.exists(), "don't have logfile?"
1006+
assert server.logfile.exists(), "don't have logfile?" + repr(self)
10061007
return server.logfile.read_text(errors="backslashreplace")
10071008

10081009
@step

0 commit comments

Comments
 (0)