Skip to content

Commit 6ae97f6

Browse files
Consider host scope first during endpoint selection while copying between primary storages
1 parent 11c2776 commit 6ae97f6

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,13 @@ protected EndPoint findEndPointForImageMove(DataStore srcStore, DataStore destSt
232232

233233
// assumption, at least one of scope should be zone, find the least
234234
// scope
235-
if (srcScope.getScopeType() != ScopeType.ZONE) {
235+
if (srcScope.getScopeType() == ScopeType.HOST) {
236+
selectedScope = srcScope;
237+
poolId = srcStore.getId();
238+
} else if (destScope.getScopeType() == ScopeType.HOST) {
239+
selectedScope = destScope;
240+
poolId = destStore.getId();
241+
} else if (srcScope.getScopeType() != ScopeType.ZONE) {
236242
selectedScope = srcScope;
237243
poolId = srcStore.getId();
238244
} else if (destScope.getScopeType() != ScopeType.ZONE) {

0 commit comments

Comments
 (0)