forked from zstackio/zstack
-
Notifications
You must be signed in to change notification settings - Fork 0
fix[zbs]: fail attach when host deploy failure ratio reaches threshold (ZSTAC-86222) #4473
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
Closed
ZStack-Robot
wants to merge
1
commit into
5.5.28
from
sync/jin.ma/fix/ZSTAC-86222-attach-deploy-threshold@@2
Closed
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
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
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
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
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
228 changes: 228 additions & 0 deletions
228
.../zstack/test/integration/storage/primary/addon/zbs/ZbsVhostAttachDeployFailureCase.groovy
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,228 @@ | ||
| package org.zstack.test.integration.storage.primary.addon.zbs | ||
|
|
||
| import org.springframework.http.HttpEntity | ||
| import org.zstack.core.db.Q | ||
| import org.zstack.header.storage.addon.primary.ExternalPrimaryStorageHostProtocolRefVO | ||
| import org.zstack.header.storage.addon.primary.ExternalPrimaryStorageHostProtocolRefVO_ | ||
| import org.zstack.header.storage.backup.UploadImageToRemoteTargetMsg | ||
| import org.zstack.header.storage.backup.UploadImageToRemoteTargetReply | ||
| import org.zstack.header.storage.primary.PrimaryStorageHostStatus | ||
| import org.zstack.core.cloudbus.CloudBus | ||
| import org.zstack.header.volume.VolumeProtocol | ||
| import org.zstack.sdk.ClusterInventory | ||
| import org.zstack.sdk.HostInventory | ||
| import org.zstack.sdk.PrimaryStorageInventory | ||
| import org.zstack.storage.zbs.ZbsConstants | ||
| import org.zstack.storage.zbs.ZbsStorageController | ||
| import org.zstack.test.integration.storage.StorageTest | ||
| import org.zstack.testlib.EnvSpec | ||
| import org.zstack.testlib.SubCase | ||
| import org.zstack.utils.data.SizeUnit | ||
| import org.zstack.utils.gson.JSONObjectUtil | ||
|
|
||
| import java.util.concurrent.atomic.AtomicReference | ||
|
|
||
| class ZbsVhostAttachDeployFailureCase extends SubCase { | ||
| EnvSpec env | ||
| CloudBus bus | ||
| PrimaryStorageInventory ps | ||
| ClusterInventory cluster | ||
| HostInventory kvm1, kvm2 | ||
|
|
||
| @Override | ||
| void clean() { | ||
| env.delete() | ||
| } | ||
|
|
||
| @Override | ||
| void setup() { | ||
| useSpring(StorageTest.springSpec) | ||
| } | ||
|
|
||
| @Override | ||
| void environment() { | ||
| env = makeEnv { | ||
| instanceOffering { | ||
| name = "instanceOffering" | ||
| memory = SizeUnit.GIGABYTE.toByte(8) | ||
| cpu = 4 | ||
| } | ||
|
|
||
| sftpBackupStorage { | ||
| name = "sftp" | ||
| url = "/sftp" | ||
| username = "root" | ||
| password = "password" | ||
| hostname = "127.0.0.2" | ||
|
|
||
| image { | ||
| name = "image" | ||
| url = "http://zstack.org/download/test.qcow2" | ||
| size = SizeUnit.GIGABYTE.toByte(1) | ||
| virtio = true | ||
| } | ||
| } | ||
|
|
||
| zone { | ||
| name = "zone" | ||
|
|
||
| cluster { | ||
| name = "cluster" | ||
| hypervisorType = "KVM" | ||
|
|
||
| kvm { | ||
| name = "kvm1" | ||
| managementIp = "127.0.0.1" | ||
| username = "root" | ||
| password = "password" | ||
| } | ||
|
|
||
| kvm { | ||
| name = "kvm2" | ||
| managementIp = "127.0.0.2" | ||
| username = "root" | ||
| password = "password" | ||
| } | ||
|
|
||
| attachL2Network("l2") | ||
| } | ||
|
|
||
| l2NoVlanNetwork { | ||
| name = "l2" | ||
| physicalInterface = "eth0" | ||
|
|
||
| l3Network { | ||
| name = "l3" | ||
| ip { | ||
| startIp = "192.168.100.10" | ||
| endIp = "192.168.100.100" | ||
| netmask = "255.255.255.0" | ||
| gateway = "192.168.100.1" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| externalPrimaryStorage { | ||
| name = "zbs-vhost" | ||
| identity = "zbs" | ||
| defaultOutputProtocol = "Vhost" | ||
| config = "{\"mdsUrls\":[\"root:password@127.0.1.1\",\"root:password@127.0.1.2\",\"root:password@127.0.1.3\"],\"logicalPoolName\":\"lpool1\"}" | ||
| url = "zbs" | ||
| } | ||
|
|
||
| attachBackupStorage("sftp") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| void test() { | ||
| env.create { | ||
| ps = env.inventoryByName("zbs-vhost") as PrimaryStorageInventory | ||
| cluster = env.inventoryByName("cluster") as ClusterInventory | ||
| kvm1 = env.inventoryByName("kvm1") as HostInventory | ||
| kvm2 = env.inventoryByName("kvm2") as HostInventory | ||
| bus = bean(CloudBus.class) | ||
|
|
||
| testAttachFailsWhenDeployFailureRatioReachesThreshold() | ||
| testAttachSucceedsBelowThresholdThenSelfHeals() | ||
| } | ||
| } | ||
|
|
||
| // one of two hosts fails vhost deploy -> 50% > default 0.3 threshold -> attach fails | ||
| void testAttachFailsWhenDeployFailureRatioReachesThreshold() { | ||
| AtomicReference<String> failHostIp = new AtomicReference<>("127.0.0.2") | ||
| registerBaseStubs(failHostIp) | ||
|
|
||
| expect(AssertionError.class) { | ||
| attachPrimaryStorageToCluster { | ||
| primaryStorageUuid = ps.uuid | ||
| clusterUuid = cluster.uuid | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // raise threshold to 0.6 so 50% < 0.6 -> attach succeeds; failed host stays Disconnected then self-heals | ||
| void testAttachSucceedsBelowThresholdThenSelfHeals() { | ||
| updateGlobalConfig { | ||
| category = "externalPrimaryStorage" | ||
| name = "attach.hostDeployFailureRatioThreshold" | ||
| value = 0.6 | ||
| } | ||
|
|
||
| AtomicReference<String> failHostIp = new AtomicReference<>("127.0.0.2") | ||
| registerBaseStubs(failHostIp) | ||
|
|
||
| attachPrimaryStorageToCluster { | ||
| primaryStorageUuid = ps.uuid | ||
| clusterUuid = cluster.uuid | ||
| } | ||
|
|
||
| assert Q.New(ExternalPrimaryStorageHostProtocolRefVO.class) | ||
| .eq(ExternalPrimaryStorageHostProtocolRefVO_.primaryStorageUuid, ps.uuid) | ||
| .eq(ExternalPrimaryStorageHostProtocolRefVO_.hostUuid, kvm2.uuid) | ||
| .eq(ExternalPrimaryStorageHostProtocolRefVO_.protocol, VolumeProtocol.Vhost.toString()) | ||
| .eq(ExternalPrimaryStorageHostProtocolRefVO_.status, PrimaryStorageHostStatus.Disconnected) | ||
| .isExists() : "failed host must be recorded Disconnected" | ||
|
|
||
| assert Q.New(ExternalPrimaryStorageHostProtocolRefVO.class) | ||
| .eq(ExternalPrimaryStorageHostProtocolRefVO_.primaryStorageUuid, ps.uuid) | ||
| .eq(ExternalPrimaryStorageHostProtocolRefVO_.hostUuid, kvm1.uuid) | ||
| .eq(ExternalPrimaryStorageHostProtocolRefVO_.protocol, VolumeProtocol.Vhost.toString()) | ||
| .eq(ExternalPrimaryStorageHostProtocolRefVO_.status, PrimaryStorageHostStatus.Connected) | ||
| .isExists() : "healthy host must be Connected" | ||
|
|
||
| failHostIp.set(null) | ||
| updateGlobalConfig { | ||
| category = "host" | ||
| name = "ping.interval" | ||
| value = 1 | ||
| } | ||
|
|
||
| retryInSecs(30) { | ||
| assert Q.New(ExternalPrimaryStorageHostProtocolRefVO.class) | ||
| .eq(ExternalPrimaryStorageHostProtocolRefVO_.primaryStorageUuid, ps.uuid) | ||
| .eq(ExternalPrimaryStorageHostProtocolRefVO_.hostUuid, kvm2.uuid) | ||
| .eq(ExternalPrimaryStorageHostProtocolRefVO_.protocol, VolumeProtocol.Vhost.toString()) | ||
| .eq(ExternalPrimaryStorageHostProtocolRefVO_.status, PrimaryStorageHostStatus.Connected) | ||
| .isExists() : "periodic ping did not self-heal the previously failed host" | ||
| } | ||
|
|
||
| detachPrimaryStorageFromCluster { | ||
| primaryStorageUuid = ps.uuid | ||
| clusterUuid = cluster.uuid | ||
| } | ||
| } | ||
|
|
||
| void registerBaseStubs(AtomicReference<String> failHostIp) { | ||
| env.message(UploadImageToRemoteTargetMsg.class) { UploadImageToRemoteTargetMsg msg, CloudBus b -> | ||
| b.reply(msg, new UploadImageToRemoteTargetReply()) | ||
| } | ||
|
|
||
| env.simulator(ZbsStorageController.PREPARE_VHOST_TARGET_ENV_PATH) { HttpEntity<String> e, EnvSpec spec -> | ||
| def cmd = JSONObjectUtil.toObject(e.body, ZbsStorageController.PrepareVhostTargetEnvCmd.class) | ||
| return new ZbsStorageController.AgentResponse() | ||
| } | ||
| env.simulator(ZbsStorageController.DEPLOY_VHOST_PATH) { HttpEntity<String> e, EnvSpec spec -> | ||
| def cmd = JSONObjectUtil.toObject(e.body, ZbsStorageController.DeployVhostCmd.class) | ||
| if (cmd.hostIp == failHostIp.get()) { | ||
| throw new RuntimeException("vhost deploy fails on purpose for host ${cmd.hostIp}") | ||
| } | ||
| return new ZbsStorageController.AgentResponse() | ||
| } | ||
| env.simulator(ZbsStorageController.VHOST_TARGET_HEALTH_PATH) { HttpEntity<String> e, EnvSpec spec -> | ||
| def rsp = new ZbsStorageController.VhostTargetHealthRsp() | ||
| rsp.targetRunning = true | ||
| return rsp | ||
| } | ||
| env.afterSimulator(ZbsStorageController.CREATE_VOLUME_PATH) { rsp, HttpEntity<String> e -> | ||
| def cmd = JSONObjectUtil.toObject(e.body, ZbsStorageController.CreateVolumeCmd) | ||
| if (cmd.volume == ZbsConstants.ZBS_HEARTBEAT_VOLUME_NAME) { | ||
| def vrsp = new ZbsStorageController.CreateVolumeRsp() | ||
| vrsp.installPath = "zbs://${cmd.logicalPool}/${cmd.volume}".toString() | ||
| return vrsp | ||
| } | ||
| return rsp | ||
| } | ||
| } | ||
| } |
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
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
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.
🎯 Functional Correctness | 🟠 Major | ⚡ Quick win
校验边界与设计意图不一致，
threshold=1会使阈值保护完全失效。PR 目标中明确指出该配置应仅接受开区间
(0, 1)的取值（即 0 和 1 都应被拒绝），但当前代码v <= 0 || v > 1允许v == 1通过校验。结合
ExternalPrimaryStorage.attachHook中的判断逻辑if ((double) failedCount.incrementAndGet() / totalHosts > threshold)：当threshold == 1时，failedCount / totalHosts永远不会大于 1（因为失败数不会超过总数），导致即使所有主机部署失败，attach 也不会因阈值判断而失败——阈值保护机制被静默禁用。建议将上边界改为
v >= 1，与设计意图（开区间）保持一致。🐛 建议修复
（同时应同步更新错误提示文案，例如改为 "must be greater than 0 and less than 1"。）
📝 Committable suggestion
🤖 Prompt for AI Agents