forked from zstackio/zstack
-
Notifications
You must be signed in to change notification settings - Fork 0
<fix>[volume]: <description #3123
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.
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
zsv_4.10.28
Choose a base branch
from
sync/tao.gan/anyun-ZSV-1@@4
base: zsv_4.10.28
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
46 changes: 46 additions & 0 deletions
46
header/src/main/java/org/zstack/header/image/UploadFileToBackupStorageHostMsg.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| package org.zstack.header.image; | ||
|
|
||
| import org.zstack.header.log.NoLogging; | ||
| import org.zstack.header.message.NeedReplyMessage; | ||
| import org.zstack.header.storage.backup.BackupStorageMessage; | ||
|
|
||
| public class UploadFileToBackupStorageHostMsg extends NeedReplyMessage implements BackupStorageMessage { | ||
| private String backupStorageUuid; | ||
| private String taskUuid; | ||
| @NoLogging(type = NoLogging.Type.Uri) | ||
| private String url; | ||
| private String installPath; | ||
|
|
||
| @Override | ||
| public String getBackupStorageUuid() { | ||
| return backupStorageUuid; | ||
| } | ||
|
|
||
| public void setBackupStorageUuid(String backupStorageUuid) { | ||
| this.backupStorageUuid = backupStorageUuid; | ||
| } | ||
|
|
||
| public String getTaskUuid() { | ||
| return taskUuid; | ||
| } | ||
|
|
||
| public void setTaskUuid(String taskUuid) { | ||
| this.taskUuid = taskUuid; | ||
| } | ||
|
|
||
| public String getUrl() { | ||
| return url; | ||
| } | ||
|
|
||
| public void setUrl(String url) { | ||
| this.url = url; | ||
| } | ||
|
|
||
| public String getInstallPath() { | ||
| return installPath; | ||
| } | ||
|
|
||
| public void setInstallPath(String installPath) { | ||
| this.installPath = installPath; | ||
| } | ||
| } |
35 changes: 35 additions & 0 deletions
35
header/src/main/java/org/zstack/header/image/UploadFileToBackupStorageHostReply.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| package org.zstack.header.image; | ||
|
|
||
| import org.zstack.header.log.NoLogging; | ||
| import org.zstack.header.message.MessageReply; | ||
|
|
||
| public class UploadFileToBackupStorageHostReply extends MessageReply { | ||
| private String md5sum; | ||
| private long size; | ||
| @NoLogging(type = NoLogging.Type.Uri) | ||
| private String directUploadUrl; | ||
|
|
||
| public String getMd5sum() { | ||
| return md5sum; | ||
| } | ||
|
|
||
| public void setMd5sum(String md5sum) { | ||
| this.md5sum = md5sum; | ||
| } | ||
|
|
||
| public long getSize() { | ||
| return size; | ||
| } | ||
|
|
||
| public void setSize(long size) { | ||
| this.size = size; | ||
| } | ||
|
|
||
| public String getDirectUploadUrl() { | ||
| return directUploadUrl; | ||
| } | ||
|
|
||
| public void setDirectUploadUrl(String directUploadUrl) { | ||
| this.directUploadUrl = directUploadUrl; | ||
| } | ||
| } |
34 changes: 34 additions & 0 deletions
34
header/src/main/java/org/zstack/header/storage/backup/GetFileDownloadProgressMsg.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| package org.zstack.header.storage.backup; | ||
|
|
||
| import org.zstack.header.message.NeedReplyMessage; | ||
|
|
||
| public class GetFileDownloadProgressMsg extends NeedReplyMessage implements BackupStorageMessage { | ||
| private String backupStorageUuid; | ||
| private String taskUuid; | ||
| private String hostname; | ||
|
|
||
| @Override | ||
| public String getBackupStorageUuid() { | ||
| return backupStorageUuid; | ||
| } | ||
|
|
||
| public void setBackupStorageUuid(String backupStorageUuid) { | ||
| this.backupStorageUuid = backupStorageUuid; | ||
| } | ||
|
|
||
| public String getTaskUuid() { | ||
| return taskUuid; | ||
| } | ||
|
|
||
| public void setTaskUuid(String taskUuid) { | ||
| this.taskUuid = taskUuid; | ||
| } | ||
|
|
||
| public String getHostname() { | ||
| return hostname; | ||
| } | ||
|
|
||
| public void setHostname(String hostname) { | ||
| this.hostname = hostname; | ||
| } | ||
| } |
92 changes: 92 additions & 0 deletions
92
header/src/main/java/org/zstack/header/storage/backup/GetFileDownloadProgressReply.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| package org.zstack.header.storage.backup; | ||
|
|
||
| import org.zstack.header.message.MessageReply; | ||
|
|
||
| public class GetFileDownloadProgressReply extends MessageReply { | ||
| private boolean completed; | ||
| private int progress; | ||
|
|
||
| private long size; | ||
| private long actualSize; | ||
| private long downloadSize; | ||
| private String installPath; | ||
| private String format; | ||
| private long lastOpTime; | ||
| private boolean supportSuspend; | ||
|
|
||
| public boolean isCompleted() { | ||
| return completed; | ||
| } | ||
|
|
||
| public void setCompleted(boolean completed) { | ||
| this.completed = completed; | ||
| } | ||
|
|
||
| public int getProgress() { | ||
| return progress; | ||
| } | ||
|
|
||
| public void setProgress(int progress) { | ||
| this.progress = progress; | ||
| } | ||
|
|
||
| public long getSize() { | ||
| return size; | ||
| } | ||
|
|
||
| public void setSize(long size) { | ||
| this.size = size; | ||
| } | ||
|
|
||
| public long getActualSize() { | ||
| return actualSize; | ||
| } | ||
|
|
||
| public void setActualSize(long actualSize) { | ||
| this.actualSize = actualSize; | ||
| } | ||
|
|
||
| public boolean isDownloadComplete() { | ||
| return actualSize > 0 && actualSize == downloadSize; | ||
| } | ||
|
|
||
| public String getInstallPath() { | ||
| return installPath; | ||
| } | ||
|
|
||
| public void setInstallPath(String installPath) { | ||
| this.installPath = installPath; | ||
| } | ||
|
|
||
| public String getFormat() { | ||
| return format; | ||
| } | ||
|
|
||
| public void setFormat(String format) { | ||
| this.format = format; | ||
| } | ||
|
|
||
| public long getLastOpTime() { | ||
| return lastOpTime; | ||
| } | ||
|
|
||
| public void setLastOpTime(long lastOpTime) { | ||
| this.lastOpTime = lastOpTime; | ||
| } | ||
|
|
||
| public long getDownloadSize() { | ||
| return downloadSize; | ||
| } | ||
|
|
||
| public void setDownloadSize(long downloadSize) { | ||
| this.downloadSize = downloadSize; | ||
| } | ||
|
|
||
| public boolean isSupportSuspend() { | ||
| return supportSuspend; | ||
| } | ||
|
|
||
| public void setSupportSuspend(boolean supportSuspend) { | ||
| this.supportSuspend = supportSuspend; | ||
| } | ||
| } | ||
1 change: 1 addition & 0 deletions
1
header/src/main/java/org/zstack/header/volume/APICreateDataVolumeMsg.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
缺少
md5sum字段。在
CephBackupStorageBase.java第 2171 行调用了reply.setMd5sum(rsp.md5sum),但此类未定义md5sum字段,会导致编译错误。🔎 建议添加 md5sum 字段
public class GetFileDownloadProgressReply extends MessageReply { private boolean completed; private int progress; private long size; private long actualSize; private long downloadSize; private String installPath; private String format; private long lastOpTime; private boolean supportSuspend; + private String md5sum; + + public String getMd5sum() { + return md5sum; + } + + public void setMd5sum(String md5sum) { + this.md5sum = md5sum; + }🤖 Prompt for AI Agents