Commit 8a2561ad authored by Xavier Thompson's avatar Xavier Thompson

slapgrid: Ignore slapformat dump file in warning

Running slapformat creates a `.slapos-resource` file in each partition.
Running slapgrid emits a warning if a free partition dir is not empty.

With this commit, slapgrid only emits a warning if a free partition
contains entries other than the slapformat dump file.
parent 0529d19f
...@@ -1276,6 +1276,7 @@ stderr_logfile_backups=1 ...@@ -1276,6 +1276,7 @@ stderr_logfile_backups=1
Try to filter valid partitions to be processed from free partitions. Try to filter valid partitions to be processed from free partitions.
""" """
filtered_computer_partition_list = [] filtered_computer_partition_list = []
empty_partition_listdir = [], ['.slapos-resource']
for computer_partition in computer_partition_list: for computer_partition in computer_partition_list:
try: try:
computer_partition_path = os.path.join(self.instance_root, computer_partition_path = os.path.join(self.instance_root,
...@@ -1307,7 +1308,8 @@ stderr_logfile_backups=1 ...@@ -1307,7 +1308,8 @@ stderr_logfile_backups=1
else: else:
shutil.rmtree(garbage_path) shutil.rmtree(garbage_path)
if os.listdir(computer_partition_path) != []: # Ignore .slapos-resource file dumped by slapformat.
if os.listdir(computer_partition_path) not in empty_partition_listdir:
self.logger.warning("Free partition %s contains file(s) in %s." % ( self.logger.warning("Free partition %s contains file(s) in %s." % (
computer_partition.getId(), computer_partition_path)) computer_partition.getId(), computer_partition_path))
continue continue
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment