fix lvol event msg, snapshot add

Author: hamdy-simplyblock

simplyblock_core/controllers/lvol_events.py

@@ -17,29 +17,29 @@ def _lvol_event(lvol, message, caused_by, event):
         db_object=lvol,
         caused_by=caused_by,
         message=message,
-        node_id=lvol.node_id)
+        node_id=lvol.get_id())
 
 
 def lvol_create(lvol, caused_by=ec.CAUSED_BY_CLI):
-    _lvol_event(lvol, f"LVol created: {lvol.get_id()}", caused_by, ec.EVENT_OBJ_CREATED)
+    _lvol_event(lvol, f"LVol created", caused_by, ec.EVENT_OBJ_CREATED)
 
 
 def lvol_delete(lvol, caused_by=ec.CAUSED_BY_CLI):
-    _lvol_event(lvol, f"LVol deleted: {lvol.get_id()}", caused_by, ec.EVENT_OBJ_DELETED)
+    _lvol_event(lvol, f"LVol deleted", caused_by, ec.EVENT_OBJ_DELETED)
 
 
 def lvol_status_change(lvol, new_state, old_status, caused_by=ec.CAUSED_BY_CLI):
-    _lvol_event(lvol, f"LVol {lvol.get_id()} status changed from: {old_status} to: {new_state}", caused_by, ec.EVENT_STATUS_CHANGE)
+    _lvol_event(lvol, f"LVol status changed from: {old_status} to: {new_state}", caused_by, ec.EVENT_STATUS_CHANGE)
 
 
 def lvol_migrate(lvol, old_node, new_node, caused_by=ec.CAUSED_BY_CLI):
-    _lvol_event(lvol, f"LVol {lvol.get_id()} migrated from: {old_node}, \nto {new_node}", caused_by, ec.EVENT_STATUS_CHANGE)
+    _lvol_event(lvol, f"LVol migrated from: {old_node} to: {new_node}", caused_by, ec.EVENT_STATUS_CHANGE)
 
 
 def lvol_health_check_change(lvol, new_state, old_status, caused_by=ec.CAUSED_BY_CLI):
-    _lvol_event(lvol, f"LVol {lvol.get_id()} health check changed from: {old_status} to: {new_state}", caused_by, ec.EVENT_STATUS_CHANGE)
+    _lvol_event(lvol, f"LVol health check changed from: {old_status} to: {new_state}", caused_by, ec.EVENT_STATUS_CHANGE)
 
 
 def lvol_io_error_change(lvol, new_state, old_status, caused_by=ec.CAUSED_BY_CLI):
-    _lvol_event(lvol, f"LVol {lvol.get_id()} IO Error changed from: {old_status} to: {new_state}", caused_by, ec.EVENT_STATUS_CHANGE)
+    _lvol_event(lvol, f"LVol IO Error changed from: {old_status} to: {new_state}", caused_by, ec.EVENT_STATUS_CHANGE)
 

simplyblock_core/controllers/snapshot_controller.py

@@ -120,7 +120,6 @@ def add(lvol_id, snapshot_name):
             elif sec_node.status == StorageNode.STATUS_DOWN:
                 msg = f"Secondary node is in down status, can not create snapshot"
                 logger.error(msg)
-                lvol.remove(db_controller.kv_store)
                 return False, msg
             else:
                 # sec node is not online, set primary as leader
@@ -135,7 +134,6 @@ def add(lvol_id, snapshot_name):
             # both primary and secondary are not online
             msg = f"Host nodes are not online"
             logger.error(msg)
-            lvol.remove(db_controller.kv_store)
             return False, msg
 
         if primary_node:

simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-down
-SIMPLY_BLOCK_VERSION=0.4.8
+SIMPLY_BLOCK_VERSION=0.4.9
 
 SIMPLY_BLOCK_DOCKER_IMAGE=public.ecr.aws/simply-block/simplyblock:down
 DOCKER_USER=hamdysimplyblock