Fix lint
diff --git a/staffeln/common/lock.py b/staffeln/common/lock.py
index 338ff37..a8d8a52 100644
--- a/staffeln/common/lock.py
+++ b/staffeln/common/lock.py
@@ -1,6 +1,6 @@
+import staffeln.conf
from oslo_utils import uuidutils
from tooz import coordination
-import staffeln.conf
CONF = staffeln.conf.CONF
@@ -8,9 +8,7 @@
class LockManager(object):
def __init__(self, node_id=None):
self.db_url = CONF.database.connection
- self.node_id = (
- uuidutils.generate_uuid() if node_id is None else node_id
- )
+ self.node_id = uuidutils.generate_uuid() if node_id is None else node_id
# get_coordinator(backend_url, member_id)
self.coordinator = coordination.get_coordinator(self.db_url, node_id)
diff --git a/staffeln/conductor/backup.py b/staffeln/conductor/backup.py
index 854794a..32ad315 100755
--- a/staffeln/conductor/backup.py
+++ b/staffeln/conductor/backup.py
@@ -1,7 +1,6 @@
import collections
from datetime import datetime
-import parse
import staffeln.conf
from openstack.exceptions import HttpException as OpenstackHttpException
from openstack.exceptions import ResourceNotFound as OpenstackResourceNotFound
@@ -142,7 +141,7 @@
return False
def purge_backups(self):
- #TODO make all this in a single DB command
+ # TODO make all this in a single DB command
success_tasks = self.get_queues(
filters={"backup_status": constants.BACKUP_COMPLETED}
)
@@ -331,7 +330,8 @@
self.result.add_project(project.id, project.name)
for volume in server.attached_volumes:
filter_result = self.filter_by_volume_status(
- volume["id"], project.id)
+ volume["id"], project.id
+ )
if not filter_result:
continue
diff --git a/staffeln/conductor/manager.py b/staffeln/conductor/manager.py
index 07f2595..bbd5bcb 100755
--- a/staffeln/conductor/manager.py
+++ b/staffeln/conductor/manager.py
@@ -5,13 +5,11 @@
import staffeln.conf
from futurist import periodics
from oslo_log import log
-from tooz import coordination
-
-from staffeln.common import constants, context
-from staffeln.common import lock
+from staffeln.common import constants, context, lock
from staffeln.common import time as xtime
from staffeln.conductor import backup
from staffeln.i18n import _
+from tooz import coordination
LOG = log.getLogger(__name__)
CONF = staffeln.conf.CONF
@@ -61,8 +59,9 @@
with self.lock_mgt.coordinator.get_lock(queue.volume_id):
self.controller.check_volume_backup_status(queue)
except coordination.LockAcquireFailed:
- LOG.debug("Failed to lock task for volume: "
- "%s." % queue.volume_id)
+ LOG.debug(
+ "Failed to lock task for volume: %s." % queue.volume_id
+ )
else: # time out
LOG.info(_("cycle timeout"))
for queue in queues_started:
@@ -114,8 +113,7 @@
with self.lock_mgt.coordinator.get_lock(task.volume_id):
self.controller.create_volume_backup(task)
except coordination.LockAcquireFailed:
- LOG.debug("Failed to lock task for volume: "
- "%s." % task.volume_id)
+ LOG.debug("Failed to lock task for volume: %s." % task.volume_id)
# Refresh the task queue
def _update_task_queue(self):
diff --git a/staffeln/conductor/result.py b/staffeln/conductor/result.py
index b74fdb8..c7ff1ab 100644
--- a/staffeln/conductor/result.py
+++ b/staffeln/conductor/result.py
@@ -1,10 +1,8 @@
# Email notification package
# This should be upgraded by integrating with mail server to send batch
-from oslo_log import log
-
import staffeln.conf
-from staffeln.common import constants
-from staffeln.common import email
+from oslo_log import log
+from staffeln.common import constants, email
from staffeln.common import time as xtime
from staffeln.conductor import backup
from staffeln.i18n import _
@@ -89,8 +87,11 @@
success_volumes = "<br>".join(
[
"Volume ID: %s, Backup ID: %s, backup mode: %s"
- % (str(e.volume_id), str(e.backup_id),
- "Incremental" if e.incremental else "Full")
+ % (
+ str(e.volume_id),
+ str(e.backup_id),
+ "Incremental" if e.incremental else "Full",
+ )
for e in project_success[project_id]
]
)
@@ -99,8 +100,7 @@
for project_id in project_failed:
failed_volumes = "<br>".join(
[
- "Volume ID: %s, Reason: %s"
- % (str(e.volume_id), str(e.reason))
+ "Volume ID: %s, Reason: %s" % (str(e.volume_id), str(e.reason))
for e in project_failed[project_id]
]
)
diff --git a/staffeln/db/sqlalchemy/alembic/versions/2b2b9df199bd_add_reason_column_to_queue_data_table.py b/staffeln/db/sqlalchemy/alembic/versions/2b2b9df199bd_add_reason_column_to_queue_data_table.py
index 99bfdd1..f78c91d 100644
--- a/staffeln/db/sqlalchemy/alembic/versions/2b2b9df199bd_add_reason_column_to_queue_data_table.py
+++ b/staffeln/db/sqlalchemy/alembic/versions/2b2b9df199bd_add_reason_column_to_queue_data_table.py
@@ -7,12 +7,14 @@
"""
# revision identifiers, used by Alembic.
-revision = '2b2b9df199bd'
-down_revision = 'ebdbed01e9a7'
+revision = "2b2b9df199bd"
+down_revision = "ebdbed01e9a7"
import sqlalchemy as sa # noqa: E402
from alembic import op # noqa: E402
def upgrade():
- op.add_column("queue_data", sa.Column("reason", sa.String(length=255), nullable=True))
+ op.add_column(
+ "queue_data", sa.Column("reason", sa.String(length=255), nullable=True)
+ )