-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Allow cleaning up of networks stuck in Implementing state #12409
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
Pearl1594
wants to merge
2
commits into
4.20
Choose a base branch
from
ghi12249-cleanupImplementingNetworks
base: 4.20
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.
+80
−0
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -969,13 +969,25 @@ public void reallyRun() { | |
| } | ||
|
|
||
| logger.trace("End cleanup expired async-jobs"); | ||
|
|
||
| cleanupNetworksStuckInImplementing(); | ||
|
|
||
| } catch (Throwable e) { | ||
| logger.error("Unexpected exception when trying to execute queue item, ", e); | ||
| } | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| private void cleanupNetworksStuckInImplementing() { | ||
| // Cleanup orphaned networks stuck in Implementing state without async jobs | ||
| try { | ||
| cleanupOrphanedNetworks(); | ||
| } catch (Throwable e) { | ||
| logger.error("Unexpected exception when trying to cleanup orphaned networks", e); | ||
| } | ||
| } | ||
|
|
||
| @DB | ||
| protected void expungeAsyncJob(final AsyncJobVO job) { | ||
| Transaction.execute(new TransactionCallbackNoReturn() { | ||
|
|
@@ -1284,6 +1296,74 @@ private void cleanupFailedSnapshotsCreatedWithDefaultStrategy(final long msid) { | |
| } | ||
| } | ||
|
|
||
| /** | ||
| * Cleanup networks that are stuck in Implementing state without associated async jobs. | ||
| * This only processes networks that have been stuck for longer than the job expiration threshold. | ||
| */ | ||
| private void cleanupOrphanedNetworks() { | ||
| try { | ||
| SearchCriteria<NetworkVO> sc = networkDao.createSearchCriteria(); | ||
| sc.addAnd("state", SearchCriteria.Op.EQ, Network.State.Implementing); | ||
| sc.addAnd("removed", SearchCriteria.Op.NULL); | ||
| List<NetworkVO> implementingNetworks = networkDao.search(sc, null); | ||
|
|
||
| if (implementingNetworks == null || implementingNetworks.isEmpty()) { | ||
| return; | ||
| } | ||
|
|
||
| logger.debug("Found {} networks in Implementing state, checking for orphaned networks", implementingNetworks.size()); | ||
|
|
||
| final long expireMinutes = JobExpireMinutes.value(); | ||
| final Date cutoffTime = new Date(System.currentTimeMillis() - (expireMinutes * 60 * 1000)); | ||
|
|
||
| for (NetworkVO network : implementingNetworks) { | ||
| if (network.getCreated().after(cutoffTime)) { | ||
| logger.trace("Network {} in Implementing state is only {} minutes old (threshold: {} minutes), skipping cleanup", | ||
| network.getId(), | ||
| (System.currentTimeMillis() - network.getCreated().getTime()) / 60000, | ||
| expireMinutes); | ||
| continue; | ||
| } | ||
|
|
||
| List<AsyncJobVO> jobs = _jobDao.findInstancePendingAsyncJobs("Network", network.getAccountId()); | ||
| boolean hasActiveJob = false; | ||
| for (AsyncJobVO job : jobs) { | ||
| if (job.getInstanceId() != null && job.getInstanceId().equals(network.getId())) { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can pass these checks to jobDao and find the active job? |
||
| hasActiveJob = true; | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| if (hasActiveJob) { | ||
| logger.debug("Network {} in Implementing state has active async job, skipping cleanup", network.getId()); | ||
| continue; | ||
| } | ||
|
|
||
| logger.warn("Found orphaned network {} in Implementing state without async job. " + | ||
| "Network created: {}, age: {} minutes, expiration threshold: {} minutes. Transitioning to Shutdown state.", | ||
| network.getId(), network.getCreated(), | ||
| (System.currentTimeMillis() - network.getCreated().getTime()) / 60000, | ||
| expireMinutes); | ||
| updateNetworkState(network); | ||
|
|
||
| } | ||
| } catch (Exception e) { | ||
| logger.error("Error while cleaning up orphaned networks", e); | ||
| } | ||
| } | ||
|
|
||
| private void updateNetworkState(NetworkVO network) { | ||
| try { | ||
| networkOrchestrationService.stateTransitTo(network, Network.Event.OperationFailed); | ||
| logger.info("Successfully transitioned orphaned network {} to Shutdown state using state machine", network.getId()); | ||
| } catch (final NoTransitionException e) { | ||
| logger.debug("State transition failed for orphaned network {}, forcing state update", network.getId()); | ||
| network.setState(Network.State.Shutdown); | ||
| networkDao.update(network.getId(), network); | ||
| logger.info("Successfully forced orphaned network {} to Shutdown state", network.getId()); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void onManagementNodeJoined(List<? extends ManagementServerHost> nodeList, long selfNodeId) { | ||
| } | ||
|
|
||
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.