Skip to content

core: allow trying to select new SPM when network problems with current SPM #1027

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

core: allow trying to select new SPM when network problems with current SPM #1027

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: 3 additions & 6 deletions ...dules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsProxyImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@
import org.ovirt.engine.core.vdsbroker.ResourceManager;
import org.ovirt.engine.core.vdsbroker.TransportFactory;
import org.ovirt.engine.core.vdsbroker.storage.StoragePoolDomainHelper;
import org.ovirt.engine.core.vdsbroker.vdsbroker.VDSNetworkException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -299,6 +298,7 @@ private void proceedStoragePoolStats(StoragePool storagePool) {
new SpmStatusVDSCommandParameters(curVdsId, storagePoolId));
}

// if spm status didn't work or not spm then cause failover with attempts
if (result == null
|| !result.getSucceeded()
|| result.getSucceeded() && ((SpmStatusResult) result.getReturnValue()).getSpmStatus() != SpmStatus.SPM) {
Expand All @@ -316,10 +316,7 @@ private void proceedStoragePoolStats(StoragePool storagePool) {
}
}

// if spm status didn't work or not spm and NOT NETWORK
// PROBLEM
// then cause failover with attempts
if (result != null && !(result.getExceptionObject() instanceof VDSNetworkException)) {
if (curVdsId != null) { // If there was already SPM host, then we can start failover process
Map<Guid, AsyncTaskStatus> tasksList =
(Map<Guid, AsyncTaskStatus>) resourceManager
.runVdsCommand(VDSCommandType.HSMGetAllTasksStatuses,
Expand All @@ -336,7 +333,7 @@ private void proceedStoragePoolStats(StoragePool storagePool) {
if (tasksList == null || allTasksFinished) {
nullifyInternalProxies();
} else {
if (_errorAttempts < Config.<Integer> getValue(ConfigValues.SPMFailOverAttempts)) {
if (_errorAttempts < Config.<Integer>getValue(ConfigValues.SPMFailOverAttempts)) {
_errorAttempts++;
log.warn("failed getting spm status for pool '{}' ({}), attempt number: {}",
storagePoolId, storagePool.getName(), _errorAttempts);
Expand Down