Skip to content

<fix>[ha]: ZSTAC-83890 add pre-fence peer fallback #4135

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
zstack-robot-1 wants to merge 1 commit into
base: 5.5.22
Choose a base branch
from
Open

<fix>[ha]: ZSTAC-83890 add pre-fence peer fallback #4135

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: 6 additions & 3 deletions compute/src/main/java/org/zstack/compute/vm/VmInstanceBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1059,11 +1059,14 @@ private void createPreFencePendingTag(HaStartVmInstanceMsg msg) {
String suspectHostUuid = StringUtils.trimToNull(CollectionUtils.isEmpty(msg.getSoftAvoidHostUuids()) ?
self.getLastHostUuid() : msg.getSoftAvoidHostUuids().get(0));
String peerHostUuid = StringUtils.trimToNull(msg.getAccessiblePeerHostUuid());
if (suspectHostUuid == null || peerHostUuid == null) {
logger.debug(String.format("HA-start vm[%s]: skip creating pre-fence tag because suspect host[%s] or peer host[%s] is absent",
self.getUuid(), suspectHostUuid, peerHostUuid));
if (suspectHostUuid == null) {
logger.debug(String.format("HA-start vm[%s]: skip creating pre-fence tag because suspect host is absent",
self.getUuid()));
return;
}
if (peerHostUuid == null) {
peerHostUuid = VmSystemTags.HA_PRE_FENCE_ACCESSIBLE_PEER_HOST_UUID_NONE;
}

Map<String, String> tokens = new HashMap<>();
tokens.put(VmSystemTags.HA_PRE_FENCE_SUSPECT_HOST_UUID_TOKEN, suspectHostUuid);
Expand Down
1 change: 1 addition & 0 deletions compute/src/main/java/org/zstack/compute/vm/VmSystemTags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,7 @@ public String desensitizeTag(SystemTag systemTag, String tag) {

public static String HA_PRE_FENCE_SUSPECT_HOST_UUID_TOKEN = "suspectHostUuid";
public static String HA_PRE_FENCE_ACCESSIBLE_PEER_HOST_UUID_TOKEN = "accessiblePeerHostUuid";
public static String HA_PRE_FENCE_ACCESSIBLE_PEER_HOST_UUID_NONE = "none";
public static PatternedSystemTag HA_PRE_FENCE_PENDING =
new PatternedSystemTag(String.format("haPreFencePending::{%s}::{%s}",
HA_PRE_FENCE_SUSPECT_HOST_UUID_TOKEN,
Expand Down