forked from apache/cloudstack
-
Notifications
You must be signed in to change notification settings - Fork 0
feature/CSTACKEX-65: Aggregate selection logic for creating ONTAP Volume in StoragePool creation workflow #24
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
3 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 |
|---|---|---|
|
|
@@ -131,6 +131,8 @@ public boolean connect() { | |
| throw new CloudRuntimeException("No aggregates are assigned to SVM " + svmName); | ||
| } | ||
| // Set the aggregates which are according to the storage requirements | ||
| int maxAvailableAggregateSpace = storage.getSize().intValue(); | ||
| Aggregate aggrChosen = null; | ||
| for (Aggregate aggr : aggrs) { | ||
|
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. Why does the connect method handle aggregate selection? This logic should ideally reside in the volume creation process. |
||
| s_logger.debug("Found aggregate: " + aggr.getName() + " with UUID: " + aggr.getUuid()); | ||
| Aggregate aggrResp = aggregateFeignClient.getAggregateByUUID(authHeader, aggr.getUuid()); | ||
|
|
@@ -142,13 +144,18 @@ public boolean connect() { | |
| s_logger.warn("Aggregate " + aggr.getName() + " does not have sufficient available space. Skipping this aggregate."); | ||
| continue; | ||
| } | ||
| s_logger.info("Selected aggregate: " + aggr.getName() + " for volume operations."); | ||
| this.aggregates = List.of(aggr); | ||
| if (aggrResp.getAvailableBlockStorageSpace() >= maxAvailableAggregateSpace) { | ||
| maxAvailableAggregateSpace = aggrResp.getAvailableBlockStorageSpace().intValue(); | ||
| aggrChosen = aggr; | ||
| } | ||
| } | ||
|
|
||
| this.aggregates = List.of(aggrChosen); | ||
| if (this.aggregates == null || this.aggregates.isEmpty()) { | ||
| s_logger.error("No suitable aggregates found on SVM " + svmName + " for volume creation."); | ||
| throw new CloudRuntimeException("No suitable aggregates found on SVM " + svmName + " for volume creation."); | ||
| } | ||
| s_logger.info("Selected aggregate: " + aggrChosen.getName() + " for volume operations."); | ||
| s_logger.info("Successfully connected to ONTAP cluster and validated ONTAP details provided"); | ||
| } catch (Exception e) { | ||
| throw new CloudRuntimeException("Failed to connect to ONTAP cluster: " + e.getMessage(), e); | ||
|
|
||
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.
Since size isn’t assigned before connect executes, the process cannot succeed.
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.
Storage is already assigned but the other comment makes sense, aggregate selection should be in Volume creation code. So, have modified the code accordingly
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.
Let’s go over the code in the scrum meeting. My review was limited to the merged changes and the code review raised, so I’d appreciate your input on the code as it appears in your IDE.