Skip to content

[ceph]: skip ceph ops on non-enabled cluster timeout #3947

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

[ceph]: skip ceph ops on non-enabled cluster timeout #3947

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
18 changes: 17 additions & 1 deletion plugin/ceph/src/main/java/org/zstack/storage/ceph/primary/CephKvmExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,26 @@
import org.zstack.storage.ceph.CephConstants;
import org.zstack.storage.primary.CheckHostStorageConnectionMsg;
import org.zstack.utils.CollectionUtils;
import org.zstack.utils.Utils;
import org.zstack.utils.function.Function;
import org.zstack.utils.logging.CLogger;

import org.zstack.header.cluster.ClusterState;
import org.zstack.header.cluster.ClusterVO;

import javax.persistence.TypedQuery;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;

import static org.zstack.utils.CollectionDSL.list;

/**
* Created by frank on 8/17/2015.
*/
public class CephKvmExtension implements KVMHostConnectExtensionPoint, HostConnectionReestablishExtensionPoint {
private static final CLogger logger = Utils.getLogger(CephKvmExtension.class);

@Autowired
private CloudBus bus;
@Autowired
Expand All @@ -50,6 +58,14 @@ public void connectionReestablished(HostInventory inv) throws HostException {
return;
}

// skip Ceph storage operations if cluster is not Enabled (ZSTAC-80275)
ClusterVO cluster = dbf.findByUuid(inv.getClusterUuid(), ClusterVO.class);
if (cluster != null && cluster.getState() != ClusterState.Enabled) {
logger.info(String.format("skip Ceph secret creation on host[uuid:%s] because cluster[uuid:%s] is %s",
inv.getUuid(), inv.getClusterUuid(), cluster.getState()));
return;
}

FutureCompletion completion = new FutureCompletion(null);
createSecret(inv.getUuid(), inv.getClusterUuid(), new Completion(completion) {
@Override
Expand All @@ -63,7 +79,7 @@ public void fail(ErrorCode errorCode) {
}
});

completion.await();
completion.await(TimeUnit.MINUTES.toMillis(5));

if (!completion.isSuccess()) {
throw new OperationFailureException(completion.getErrorCode());
Expand Down