diff --git a/dsms-engine-common/src/main/java/com/dsms/common/handler/GlobalExceptionHandler.java b/dsms-engine-common/src/main/java/com/dsms/common/handler/GlobalExceptionHandler.java index e9a2f7a2ed927c7c1c1c940726b19517d0d4f637..c257284f5b4d8535e97fe05bd27de12ff7b333d1 100644 --- a/dsms-engine-common/src/main/java/com/dsms/common/handler/GlobalExceptionHandler.java +++ b/dsms-engine-common/src/main/java/com/dsms/common/handler/GlobalExceptionHandler.java @@ -32,6 +32,7 @@ import org.springframework.web.servlet.NoHandlerFoundException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.Optional; /** * 全局异常处理 diff --git a/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/cluster/service/IClusterService.java b/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/cluster/service/IClusterService.java index bd1e58e025664b4dc67c727c98ffebed86d13b17..85aca5e97717dc0bc17a6a30b30df8112679da87 100644 --- a/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/cluster/service/IClusterService.java +++ b/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/cluster/service/IClusterService.java @@ -23,20 +23,20 @@ import com.dsms.dfsbroker.cluster.model.Cluster; public interface IClusterService extends IService { /** - * 获取集群关于信息 + * get current bound cluster info * - * @return 集群对象 + * @return bound cluster info */ Cluster about(); /** - * 关联集群 + * bind cluster * - * @return 集群信息 + * @return cluster info */ Cluster bind(Cluster cluster); /** - * 解绑集群 + * unbind current cluster */ boolean unbind(); diff --git a/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/common/RequestUrlEnum.java b/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/common/RequestUrlEnum.java index 6838231b01c3567bdf3bb0e9976992b952ce203f..114c744bf78605603a8a4b0b5efb23b12f1694b2 100644 --- a/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/common/RequestUrlEnum.java +++ b/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/common/RequestUrlEnum.java @@ -21,7 +21,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * dfsbroker 请求url枚举 + * dsms-storage restful api url enum */ @Getter @AllArgsConstructor diff --git a/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/node/api/NodeApi.java b/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/node/api/NodeApi.java index ecb92a0c09872c4d6062948384badf71690b4231..90c6086e11f4319e30529db4ff0ebe6b3aa47156 100644 --- a/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/node/api/NodeApi.java +++ b/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/node/api/NodeApi.java @@ -55,9 +55,10 @@ public class NodeApi { private CommonApi commonApi; /** - * 获取集群节点列表 + * get dsms-storage node list + * call /mon api * - * @return 节点列表 + * @return /mon response */ public List getNodeList(RemoteRequest remoteRequest) throws Throwable { CommandDirector.constructMonRequest(remoteRequest); diff --git a/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/node/model/Node.java b/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/node/model/Node.java index f1bc88599afe406b1d72f986aa4ce51ba995d540..002c9fc772a9954d6bcb98d0837c5706312b2d4e 100644 --- a/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/node/model/Node.java +++ b/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/node/model/Node.java @@ -33,9 +33,7 @@ public class Node implements Serializable { private static final long serialVersionUID = 1L; - /** - * 节点版本 - */ + @ApiModelProperty("节点version") private String version; @ApiModelProperty("节点id") diff --git a/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/node/model/remote/OrchDeviceLsResult.java b/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/node/model/remote/OrchDeviceLsResult.java index 40941bb84b2f51d5940b7970dee9e1e86ff2e961..20ab4522cfe46213e7bedef1f970c645451294f5 100644 --- a/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/node/model/remote/OrchDeviceLsResult.java +++ b/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/node/model/remote/OrchDeviceLsResult.java @@ -22,26 +22,26 @@ import lombok.Data; import java.util.List; /** - * orch device ls 执行结果 + * dsms-storage (orch device ls) execute result */ @Data public class OrchDeviceLsResult { /** - * ceph 响应 addr 字段 + * dsms-storage response addr field */ private String addr; /** - * ceph 响应 devices 字段 + * dsms-storage response devices field */ private List devices; /** - * ceph 响应 labels 字段 + * dsms-storage response labels field */ private List labels; /** - * ceph 响应 name 字段 + * dsms-storage response name field */ private String name; } diff --git a/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/node/model/remote/OsdDfResult.java b/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/node/model/remote/OsdDfResult.java index 928e6efe3758e23f5934c542de31a2a79b362a85..9423dd5cacbd0c80bcb94be51752208c529a8832 100644 --- a/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/node/model/remote/OsdDfResult.java +++ b/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/node/model/remote/OsdDfResult.java @@ -22,21 +22,21 @@ import lombok.Data; import java.util.List; /** - * osd df 执行结果 + * dsms-storage (osd df) execute result */ @Data public class OsdDfResult { /** - * ceph 响应 nodes 字段 + * dsms-storage response nodes field */ private List nodes; /** - * ceph 响应 Stray 字段 + * dsms-storage response stray field */ private List stray; /** - * ceph 响应 summary 字段 + * dsms-storage response summary field */ private Summary summary; } diff --git a/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/node/model/remote/OsdRmStatusResult.java b/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/node/model/remote/OsdRmStatusResult.java index a3b114e4978ebc1197b0a33317138a3d6ca0b174..8eb97de0e79d3c6b584f5a69b01134c3d04f1b1e 100644 --- a/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/node/model/remote/OsdRmStatusResult.java +++ b/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/node/model/remote/OsdRmStatusResult.java @@ -21,6 +21,10 @@ import lombok.Data; import java.time.LocalDateTime; + +/** + * dsms-storage (orch osd rm status) execute result + */ @Data public class OsdRmStatusResult { diff --git a/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/node/service/INodeService.java b/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/node/service/INodeService.java index 70120139c08fce63d467c1976e5cabe0256f358b..25bae4460f57905979d6e21c117676f4fad85229 100644 --- a/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/node/service/INodeService.java +++ b/dsms-engine-dfsbroker/src/main/java/com/dsms/dfsbroker/node/service/INodeService.java @@ -23,27 +23,32 @@ import java.util.List; public interface INodeService { /** - * 节点池列表 - * @return 当前绑定集群的全部节点信息 + * get dsms-storage all node info + * + * @return nodes info list */ List list(); /** - * 单个节点信息 - * @param nodeName 节点名称 - * @return 包含磁盘信息的node对象 + * get dsms-storage special node info + * + * @param nodeName node name + * @return node info */ Node getNodeInfo(String nodeName); /** - * 节点新增磁盘 - * @param nodeName 节点名称 - * @param devicePath 节点路径 + * node add osd + * + * @param nodeName node name + * @param devicePath node disk path */ boolean addOsd(String nodeName, String devicePath); + /** - * 节点移除磁盘 - * @param osdId osdId + * node remove osd + * + * @param osdId osd id */ boolean removeOsd(Integer osdId);