From 77bf62cf6c23d78027e7248e023b7b348800dac3 Mon Sep 17 00:00:00 2001 From: mabofu Date: Tue, 25 Feb 2025 20:00:51 +0800 Subject: [PATCH] Fixed sonar issue: fixed StoragePoolImpl issue --- .../service/impl/StoragePoolImpl.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dsms-engine-application/src/main/java/com/dsms/modules/storagepool/service/impl/StoragePoolImpl.java b/dsms-engine-application/src/main/java/com/dsms/modules/storagepool/service/impl/StoragePoolImpl.java index 220f898..6972073 100644 --- a/dsms-engine-application/src/main/java/com/dsms/modules/storagepool/service/impl/StoragePoolImpl.java +++ b/dsms-engine-application/src/main/java/com/dsms/modules/storagepool/service/impl/StoragePoolImpl.java @@ -89,6 +89,8 @@ public class StoragePoolImpl implements IStoragePoolService { private static final int AVAILABLE_POOL_MIN_USED_OSD_NUM_IN_ONE_HOST = 1; private static final String DEFAULT_POOL = "device_health_metrics"; private static final String NOT_ALLOWED_REMOVE_OSD_REASON = "存储池需要冗余模式数量的节点磁盘对数据进行平衡和备份，移除磁盘操作可能会导致存储池不可用和数据丢失，请通过删除存储池或添加大于冗余模式数量磁盘的方式移除磁盘"; + private static final String TASK_ALREADY_EXIST = "Task already exist,task message: {}"; + private static final String TASK_CREATE_FAILED = "Task create failed exist,task message: {}"; StoragePoolApi storagePoolApi; @@ -502,7 +504,7 @@ public class StoragePoolImpl implements IStoragePoolService { String poolType = StoragePoolTypeEnum.getPoolType(storagePoolCreateDTO.getPoolType()); String taskMessage = TaskTypeEnum.CREATE_POOL.getName() + ":" + storagePoolCreateDTO.getPoolName() + ", 存储池类型:" + poolType; if (!taskContext.validateTask(TaskTypeEnum.CREATE_POOL, taskMessage)) { - log.warn("Task already exist,task message:{}", taskMessage); + log.warn(TASK_ALREADY_EXIST, taskMessage); throw new DsmsEngineException(ResultCode.TASK_EXIST); } Task task = new AsyncTask( @@ -516,7 +518,7 @@ public class StoragePoolImpl implements IStoragePoolService { return createStepTask(task.getId(), storagePoolCreateDTO.getPoolName(), StoragePoolTypeEnum.getPoolType(storagePoolCreateDTO.getPoolType())); } - log.error("the task for creating storage pool has been created failed"); + log.error(TASK_CREATE_FAILED, JSONUtil.toJsonStr(task)); return false; } @@ -531,7 +533,7 @@ public class StoragePoolImpl implements IStoragePoolService { String taskMessage = TaskTypeEnum.POOL_ADD_NODE.getName() + ":" + storagePoolNodeManageDto.getPoolName(); if (!taskContext.validateTask(TaskTypeEnum.POOL_ADD_NODE, taskMessage)) { - log.warn("Task already exist,task message:{}", taskMessage); + log.warn(TASK_ALREADY_EXIST, taskMessage); throw new DsmsEngineException(ResultCode.TASK_EXIST); } Task task = new AsyncTask( @@ -545,7 +547,7 @@ public class StoragePoolImpl implements IStoragePoolService { return addNodeStepTask(task.getId(), storagePoolNodeManageDto); } - log.error("the task for creating storage pool has been created failed"); + log.error(TASK_CREATE_FAILED, JSONUtil.toJsonStr(task)); return false; } @@ -558,7 +560,7 @@ public class StoragePoolImpl implements IStoragePoolService { String taskMessage = TaskTypeEnum.POOL_REMOVE_NODE.getName() + ":" + storagePoolNodeManageDto.getPoolName(); if (!taskContext.validateTask(TaskTypeEnum.POOL_REMOVE_NODE, taskMessage)) { - log.warn("Task already exist,task message:{}", taskMessage); + log.warn(TASK_ALREADY_EXIST, taskMessage); throw new DsmsEngineException(ResultCode.TASK_EXIST); } Task task = new AsyncTask( @@ -572,7 +574,7 @@ public class StoragePoolImpl implements IStoragePoolService { return removeNodeStepTask(task.getId(), storagePoolNodeManageDto); } - log.error("the task for remove node for storage pool has been created failed"); + log.error(TASK_CREATE_FAILED, JSONUtil.toJsonStr(task)); return false; } @@ -586,7 +588,7 @@ public class StoragePoolImpl implements IStoragePoolService { String taskMessage = TaskTypeEnum.POOL_ADD_DISK.getName() + ":" + storagePoolDiskManageDto.getPoolName(); if (!taskContext.validateTask(TaskTypeEnum.POOL_ADD_DISK, taskMessage)) { - log.warn("Task already exist,task message:{}", taskMessage); + log.warn(TASK_ALREADY_EXIST, taskMessage); throw new DsmsEngineException(ResultCode.TASK_EXIST); } //check if osd has pgs @@ -617,7 +619,7 @@ public class StoragePoolImpl implements IStoragePoolService { return addDiskStepTask(task.getId(), storagePoolDiskManageDto); } - log.error("the task for remove node for storage pool has been created failed"); + log.error(TASK_CREATE_FAILED, JSONUtil.toJsonStr(task)); return false; } @@ -630,7 +632,7 @@ public class StoragePoolImpl implements IStoragePoolService { validateRemoveOsd(storagePoolDiskManageDto); String taskMessage = TaskTypeEnum.POOL_REMOVE_DISK.getName() + ":" + storagePoolDiskManageDto.getPoolName(); if (!taskContext.validateTask(TaskTypeEnum.POOL_REMOVE_DISK, taskMessage)) { - log.warn("Task already exist,task message:{}", taskMessage); + log.warn(TASK_ALREADY_EXIST, taskMessage); throw new DsmsEngineException(ResultCode.TASK_EXIST); } Task task = new AsyncTask( @@ -644,7 +646,7 @@ public class StoragePoolImpl implements IStoragePoolService { return removeDiskStepTask(task.getId(), storagePoolDiskManageDto); } - log.error("the task for remove node for storage pool has been created failed"); + log.error(TASK_CREATE_FAILED, JSONUtil.toJsonStr(task)); return false; } @@ -661,7 +663,7 @@ public class StoragePoolImpl implements IStoragePoolService { String poolType = StoragePoolTypeEnum.getPoolType(storagePool.getType()); String taskMessage = TaskTypeEnum.DELETE_POOL.getName() + ":" + storagePoolDeleteDto.getPoolName() + ", 存储池类型:" + poolType; if (!taskContext.validateTask(TaskTypeEnum.DELETE_POOL, taskMessage)) { - log.warn("Task already exist,task message:{}", taskMessage); + log.warn(TASK_ALREADY_EXIST, taskMessage); throw new DsmsEngineException(ResultCode.TASK_EXIST); } if (!ArrayUtil.isEmpty(rbdList) || !CharSequenceUtil.isBlank(fileSystem)) { @@ -762,7 +764,6 @@ public class StoragePoolImpl implements IStoragePoolService { return stepService.save(allowEcOverWritesStep); } - log.error("the task for creating storage pool has been created failed"); return false; } -- Gitee