Skip to content

<feature>[storage]: res sblk #3361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MatheMatrix wants to merge 1 commit into
base: feature-zsv-5.0.0-vm-registration
Choose a base branch
from
Open

<feature>[storage]: res sblk #3361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions conf/serviceConfig/primaryStorage.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,16 @@
<message>
<name>org.zstack.header.storage.primary.APICleanUpStorageTrashOnPrimaryStorageMsg</name>
</message>

<message>
<name>org.zstack.header.storage.primary.APIAddStorageProtocolMsg</name>
</message>

<message>
<name>org.zstack.header.storage.primary.APITakeoverPrimaryStorageMsg</name>
</message>

<message>
<name>org.zstack.header.storage.primary.APICheckPrimaryStorageConsistencyMsg</name>
</message>
</service>
29 changes: 29 additions & 0 deletions ...c/main/java/org/zstack/header/storage/primary/APICheckPrimaryStorageConsistencyEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package org.zstack.header.storage.primary;

import org.zstack.header.message.APIEvent;
import org.zstack.header.rest.RestResponse;

@RestResponse(fieldsTo = {"all"})
public class APICheckPrimaryStorageConsistencyEvent extends APIEvent {
private boolean consistent;

public boolean isConsistent() {
return consistent;
}

public void setConsistent(boolean consistent) {
this.consistent = consistent;
}

public APICheckPrimaryStorageConsistencyEvent() {
}

public APICheckPrimaryStorageConsistencyEvent(String apiId) {
super(apiId);
}

public static APICheckPrimaryStorageConsistencyEvent __example__() {
APICheckPrimaryStorageConsistencyEvent event = new APICheckPrimaryStorageConsistencyEvent();
return event;
}
}
29 changes: 29 additions & 0 deletions .../org/zstack/header/storage/primary/APICheckPrimaryStorageConsistencyEventDoc_zh_cn.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package org.zstack.header.storage.primary

import org.zstack.header.errorcode.ErrorCode

doc {

title "检查存储一致性返回"

field {
name "consistent"
desc "是否一直"
type "boolean"
since "5.0.0"
Comment on lines +9 to +13
Copy link

@coderabbitai coderabbitai bot Feb 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

字段描述疑似笔误

“是否一直”建议改为“是否一致”，避免歧义。

✅ 建议修改 
-		desc "是否一直"
+		desc "是否一致"
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
field {
name "consistent"
desc "是否一直"
type "boolean"
since "5.0.0"
field {
name "consistent"
desc "是否一致"
type "boolean"
since "5.0.0"
🤖 Prompt for AI Agents 
In
`@header/src/main/java/org/zstack/header/storage/primary/APICheckPrimaryStorageConsistencyEventDoc_zh_cn.groovy`
around lines 9 - 13, The field description for the "consistent" field contains a
typo ("是否一直"); update the desc value to the correct wording "是否一致" in the
APICheckPrimaryStorageConsistencyEventDoc_zh_cn.groovy definition so the
documentation accurately reflects that this boolean indicates whether the
storage is consistent.

}
field {
name "success"
desc ""
type "boolean"
since "5.0.0"
}
ref {
name "error"
path "org.zstack.header.storage.primary.APICheckPrimaryStorageConsistencyEvent.error"
desc "错误码，若不为null，则表示操作失败, 操作成功时该字段为null"
type "ErrorCode"
since "5.0.0"
clz ErrorCode.class
}
}
36 changes: 36 additions & 0 deletions ...src/main/java/org/zstack/header/storage/primary/APICheckPrimaryStorageConsistencyMsg.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package org.zstack.header.storage.primary;

import org.springframework.http.HttpMethod;
import org.zstack.header.message.APIMessage;
import org.zstack.header.message.APIParam;
import org.zstack.header.rest.RestRequest;

@RestRequest(
path = "/primary-storage/{uuid}/consistency",
responseClass = APICheckPrimaryStorageConsistencyEvent.class,
method = HttpMethod.PUT,
isAction = true
)
public class APICheckPrimaryStorageConsistencyMsg extends APIMessage implements PrimaryStorageMessage {
@APIParam(resourceType = PrimaryStorageVO.class)
private String uuid;

@Override
public String getPrimaryStorageUuid() {
return uuid;
}

public String getUuid() {
return uuid;
}

public void setUuid(String uuid) {
this.uuid = uuid;
}

public static APICheckPrimaryStorageConsistencyMsg __example__() {
APICheckPrimaryStorageConsistencyMsg msg = new APICheckPrimaryStorageConsistencyMsg();
msg.setUuid(uuid(PrimaryStorageVO.class));
return msg;
}
}
58 changes: 58 additions & 0 deletions ...va/org/zstack/header/storage/primary/APICheckPrimaryStorageConsistencyMsgDoc_zh_cn.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
package org.zstack.header.storage.primary

import org.zstack.header.storage.primary.APICheckPrimaryStorageConsistencyEvent

doc {
title "CheckPrimaryStorageConsistency"

category "storage.primary"

desc """检查存储一致性"""

rest {
request {
url "PUT /v1/primary-storage/{uuid}/consistency"

header (Authorization: 'OAuth the-session-uuid')

clz APICheckPrimaryStorageConsistencyMsg.class

desc """"""

params {

column {
name "uuid"
enclosedIn "checkPrimaryStorageConsistency"
desc "主存储的UUID"
location "url"
type "String"
optional false
since "5.0.0"
}
column {
name "systemTags"
enclosedIn ""
desc "系统标签"
location "body"
type "List"
optional true
since "5.0.0"
}
column {
name "userTags"
enclosedIn ""
desc "用户标签"
location "body"
type "List"
optional true
since "5.0.0"
}
}
}

response {
clz APICheckPrimaryStorageConsistencyEvent.class
}
}
}
39 changes: 39 additions & 0 deletions header/src/main/java/org/zstack/header/storage/primary/APITakeoverPrimaryStorageEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package org.zstack.header.storage.primary;

import org.zstack.header.message.APIEvent;
import org.zstack.header.rest.RestResponse;

import java.util.Collections;

@RestResponse(allTo = "inventory")
public class APITakeoverPrimaryStorageEvent extends APIEvent {
private PrimaryStorageInventory inventory;

public APITakeoverPrimaryStorageEvent() {
}

public APITakeoverPrimaryStorageEvent(String apiId) {
super(apiId);
}

public PrimaryStorageInventory getInventory() {
return inventory;
}

public void setInventory(PrimaryStorageInventory inventory) {
this.inventory = inventory;
}

public static APITakeoverPrimaryStorageEvent __example__() {
APITakeoverPrimaryStorageEvent event = new APITakeoverPrimaryStorageEvent();

PrimaryStorageInventory ps = new PrimaryStorageInventory();
ps.setName("PS1");
ps.setUrl("/zstack_ps");
ps.setType("LocalStorage");
ps.setAttachedClusterUuids(Collections.singletonList(uuid()));

event.setInventory(ps);
return event;
}
}
32 changes: 32 additions & 0 deletions ...ain/java/org/zstack/header/storage/primary/APITakeoverPrimaryStorageEventDoc_zh_cn.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package org.zstack.header.storage.primary

import org.zstack.header.storage.primary.PrimaryStorageInventory
import org.zstack.header.errorcode.ErrorCode

doc {

title "接管主存储返回"

ref {
name "inventory"
path "org.zstack.header.storage.primary.APITakeoverPrimaryStorageEvent.inventory"
desc "主存储信息"
type "PrimaryStorageInventory"
since "5.0.0"
clz PrimaryStorageInventory.class
}
field {
name "success"
desc ""
type "boolean"
since "5.0.0"
}
ref {
name "error"
path "org.zstack.header.storage.primary.APITakeoverPrimaryStorageEvent.error"
desc "错误码，若不为null，则表示操作失败, 操作成功时该字段为null"
type "ErrorCode"
since "5.0.0"
clz ErrorCode.class
}
}
36 changes: 36 additions & 0 deletions header/src/main/java/org/zstack/header/storage/primary/APITakeoverPrimaryStorageMsg.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package org.zstack.header.storage.primary;

import org.springframework.http.HttpMethod;
import org.zstack.header.message.APIMessage;
import org.zstack.header.message.APIParam;
import org.zstack.header.rest.RestRequest;

@RestRequest(
path = "/primary-storage/{uuid}/takeover",
responseClass = APITakeoverPrimaryStorageEvent.class,
method = HttpMethod.PUT,
isAction = true
)
public class APITakeoverPrimaryStorageMsg extends APIMessage implements PrimaryStorageMessage {
@APIParam(resourceType = PrimaryStorageVO.class)
private String uuid;

@Override
public String getPrimaryStorageUuid() {
return uuid;
}

public String getUuid() {
return uuid;
}

public void setUuid(String uuid) {
this.uuid = uuid;
}

public static APITakeoverPrimaryStorageMsg __example__() {
APITakeoverPrimaryStorageMsg msg = new APITakeoverPrimaryStorageMsg();
msg.setUuid(uuid(PrimaryStorageVO.class));
return msg;
}
}
58 changes: 58 additions & 0 deletions .../main/java/org/zstack/header/storage/primary/APITakeoverPrimaryStorageMsgDoc_zh_cn.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
package org.zstack.header.storage.primary

import org.zstack.header.storage.primary.APITakeoverPrimaryStorageEvent

doc {
title "TakeoverPrimaryStorage"

category "storage.primary"

desc """接管主存储"""

rest {
request {
url "PUT /v1/primary-storage/{uuid}/takeover"

header (Authorization: 'OAuth the-session-uuid')

clz APITakeoverPrimaryStorageMsg.class

desc """"""

params {

column {
name "uuid"
enclosedIn "takeoverPrimaryStorage"
desc "主存储的UUID"
location "url"
type "String"
optional false
since "5.0.0"
}
column {
name "systemTags"
enclosedIn ""
desc "系统标签"
location "body"
type "List"
optional true
since "5.0.0"
}
column {
name "userTags"
enclosedIn ""
desc "用户标签"
location "body"
type "List"
optional true
since "5.0.0"
}
}
}

response {
clz APITakeoverPrimaryStorageEvent.class
}
}
}
2 changes: 2 additions & 0 deletions sdk/src/main/java/SourceClassMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,7 @@ public class SourceClassMap {
put("org.zstack.storage.primary.local.APIGetLocalStorageHostDiskCapacityReply$HostDiskCapacity", "org.zstack.sdk.HostDiskCapacity");
put("org.zstack.storage.primary.local.LocalStorageResourceRefInventory", "org.zstack.sdk.LocalStorageResourceRefInventory");
put("org.zstack.storage.primary.sharedblock.SharedBlockCandidateStruct", "org.zstack.sdk.SharedBlockCandidateStruct");
put("org.zstack.storage.primary.sharedblock.SharedBlockGroupLunInfo", "org.zstack.sdk.SharedBlockGroupLunInfo");
put("org.zstack.storage.primary.sharedblock.SharedBlockGroupPrimaryStorageHostRefInventory", "org.zstack.sdk.SharedBlockGroupPrimaryStorageHostRefInventory");
put("org.zstack.storage.primary.sharedblock.SharedBlockGroupPrimaryStorageInventory", "org.zstack.sdk.SharedBlockGroupPrimaryStorageInventory");
put("org.zstack.storage.primary.sharedblock.SharedBlockGroupType", "org.zstack.sdk.SharedBlockGroupType");
Expand Down Expand Up @@ -1075,6 +1076,7 @@ public class SourceClassMap {
put("org.zstack.sdk.SftpBackupStorageInventory", "org.zstack.storage.backup.sftp.SftpBackupStorageInventory");
put("org.zstack.sdk.ShareableVolumeVmInstanceRefInventory", "org.zstack.mevoco.ShareableVolumeVmInstanceRefInventory");
put("org.zstack.sdk.SharedBlockCandidateStruct", "org.zstack.storage.primary.sharedblock.SharedBlockCandidateStruct");
put("org.zstack.sdk.SharedBlockGroupLunInfo", "org.zstack.storage.primary.sharedblock.SharedBlockGroupLunInfo");
put("org.zstack.sdk.SharedBlockGroupPrimaryStorageHostRefInventory", "org.zstack.storage.primary.sharedblock.SharedBlockGroupPrimaryStorageHostRefInventory");
put("org.zstack.sdk.SharedBlockGroupPrimaryStorageInventory", "org.zstack.storage.primary.sharedblock.SharedBlockGroupPrimaryStorageInventory");
put("org.zstack.sdk.SharedBlockGroupType", "org.zstack.storage.primary.sharedblock.SharedBlockGroupType");
Expand Down
Loading