Merge branch 'master' into feat-delete-user-account

Author: cuvalign

CHANGELOG.md

@@ -1,5 +1,12 @@
 # @scow/scow-scheduler-adapter-interface
 
+## 1.6.0
+
+### Minor Changes
+
+- eb952d6: 新增获取集群节点信息接口 GetClusterNodesInfo
+  在 getJobsRequest 中增加兼容型参数 job_id 和 job_name
+
 ## 1.5.0
 
 ### Minor Changes

changelogs/v1.6.0.md

@@ -0,0 +1,9 @@
+# v1.6.0
+
+发布于：2024/8/1 21:29:58
+
+## 重要更新
+- 新增获取集群节点信息接口 GetClusterNodesInfo
+在 getJobsRequest 中增加兼容型参数 job_id 和 job_name ([eb952d63](https://github.com/PKUHPC/SCOW/commit/eb952d633bc92a68e41143ce79b1c6dfa6d73a21))
+
+

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scow/scow-scheduler-adapter-interface",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "Interface for SCOW to call schedulers",
   "author": "PKUHPC (https://github.com/PKUHPC)",
   "repository": "https://github.com/PKUHPC/SCOW",

protos/account.proto

@@ -133,12 +133,12 @@ service AccountService {
    *   NOT_FOUND, ACCOUNT_NOT_FOUND, {}
    */
   rpc QueryAccountBlockStatus(QueryAccountBlockStatusRequest) returns (QueryAccountBlockStatusResponse);
-
+  
    /*
    * description: delete account
    * errors:
    * - account not exist
    *   NOT_FOUND, ACCOUNT_NOT_FOUND, {}
    */
    rpc DeleteAccount(DeleteAccountRequest) returns (DeleteAccountResponse);
-}
+}

protos/app.proto

@@ -42,4 +42,5 @@ service AppService {
    *   Sometimes it needs to provide password for app
    */
   rpc GetAppConnectionInfo(GetAppConnectionInfoRequest) returns (GetAppConnectionInfoResponse);
+
 }

protos/config.proto

@@ -86,6 +86,38 @@ message GetClusterInfoResponse {
   repeated PartitionInfo partitions = 2;
 }
 
+message NodeInfo {
+  
+  enum NodeState {
+    UNKNOWN = 0;
+    IDLE = 1;
+    RUNNING = 2;
+    NOT_AVAILABLE = 3;
+  }
+
+  string node_name = 1;
+  repeated string partitions = 2;
+  NodeState state = 3;
+  uint32 cpu_core_count = 4;
+  uint32 alloc_cpu_core_count = 5;
+  uint32 idle_cpu_core_count = 6;
+  uint32 total_mem_mb = 7;
+  uint32 alloc_mem_mb = 8;
+  uint32 idle_mem_mb = 9;
+  uint32 gpu_count = 10;
+  uint32 alloc_gpu_count = 11;
+  uint32 idle_gpu_count = 12;
+} 
+
+message GetClusterNodesInfoRequest {
+  // if the value of node_names = [], request all nodes info
+  repeated string node_names = 1;
+}
+
+message GetClusterNodesInfoResponse {
+  repeated NodeInfo nodes = 1;
+}
+
 service ConfigService {
   /*
    * description: get cluster config
@@ -99,4 +131,8 @@ service ConfigService {
    * description: get cluster information
    */
   rpc GetClusterInfo(GetClusterInfoRequest) returns (GetClusterInfoResponse);
+   /*
+   * description: get cluster nodes information
+   */
+  rpc GetClusterNodesInfo(GetClusterNodesInfoRequest) returns (GetClusterNodesInfoResponse);
 }

protos/job.proto

@@ -104,6 +104,9 @@ message GetJobsRequest {
     optional TimeRange submit_time = 4;
     // if set this field, return jobs that ended between the time range(both endpoints included)
     optional TimeRange end_time = 5;
+
+    optional uint32 job_id = 6;
+    optional string job_name = 7;
   }
   // specify filter options
   optional Filter filter = 2;
@@ -114,6 +117,7 @@ message GetJobsRequest {
 
   // returned jobs should be sorted if set
   optional SortInfo sort = 4;
+
 }
 
 message GetJobsResponse {