-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
Do not fetch runtimes when getting list of all workspaces #3557
Merged
+56
−5
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
517bc12
Do not fetch runtimes when getting list of all workspaces
9770253
fixup! Do not fetch runtimes when getting list of all workspaces
5a9e76a
Merge branch 'master' of github.com:eclipse/che into che-3082
1cff619
Merge branch 'master' of github.com:eclipse/che into che-3082
a59b469
Merge branch 'master' of github.com:eclipse/che into che-3082
9aaf874
Merge branch 'master' of github.com:eclipse/che into che-3082
ec512a3
Merge branch 'master' of github.com:eclipse/che into che-3082
cf40e29
fix
f60aeff
add test
6101815
Merge branch 'master' of github.com:eclipse/che into che-3082
426d784
small fix
0fdbfc0
Merge branch 'master' of github.com:eclipse/che into che-3082
fcfee47
fixup! Merge branch 'master' of github.com:eclipse/che into che-3082
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 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
This file contains 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
This file contains 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 |
---|---|---|
|
@@ -536,6 +536,23 @@ public Map<String, WorkspaceState> getWorkspaces() { | |
return new HashMap<>(workspaces); | ||
} | ||
|
||
/** | ||
* Return status of the workspace. | ||
* | ||
* @param workspaceId | ||
* ID of requested workspace | ||
* @return workspace status | ||
*/ | ||
public WorkspaceStatus getStatus(String workspaceId) { | ||
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. Please add tests |
||
try (@SuppressWarnings("unused") CloseableLock l = locks.acquireReadLock(workspaceId)) { | ||
final WorkspaceState state = workspaces.get(workspaceId); | ||
if (state == null) { | ||
return WorkspaceStatus.STOPPED; | ||
} | ||
return state.status; | ||
} | ||
} | ||
|
||
private MessageConsumer<MachineLogMessage> getEnvironmentLogger(String workspaceId) throws ServerException { | ||
WebsocketMessageConsumer<MachineLogMessage> envMessageConsumer = | ||
new WebsocketMessageConsumer<>(format(ENVIRONMENT_OUTPUT_CHANNEL_TEMPLATE, workspaceId)); | ||
|
This file contains 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
This file contains 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
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.
is not the same to
it looks like
is the correct option here
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.
'RUNNING' is fine here, cause wait for this status to start importing projects