opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #115 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-storage-filter to release/2.1.0

Browse Source 
* commit 'a39eea4b646da92b2e4df6ceb05980c4849164e5':
  修复过滤可用storage时，出现重复数据bug
This commit is contained in:
邱剑
2018-08-25 13:57:33 +08:00
parent 1b3b2c9707 a39eea4b64
commit 18f1abe692
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/storages.go
+9 -6
View File
@@ -664,12 +664,15 @@ func (manager *SStorageManager) ListItemFilter(ctx context.Context, q *sqlchemy.
}
if jsonutils.QueryBoolean(query, "usable", false) {
hostStorage := HoststorageManager.Query().SubQuery()
q = q.Join(hostStorage, sqlchemy.AND(
sqlchemy.Equals(hostStorage.Field("storage_id"), q.Field("id")),
sqlchemy.In(q.Field("status"), []string{STORAGE_ENABLED, STORAGE_ONLINE}),
sqlchemy.IsTrue(q.Field("enabled")),
))
hostStorageTable := HoststorageManager.Query().SubQuery()
hostTable := HostManager.Query().SubQuery()
sq := hostStorageTable.Query(hostStorageTable.Field("storage_id")).Join(hostTable,
sqlchemy.Equals(hostTable.Field("id"), hostStorageTable.Field("host_id"))).
Filter(sqlchemy.Equals(hostTable.Field("host_status"), HOST_ONLINE))
q = q.Filter(sqlchemy.In(q.Field("id"), sq)).
Filter(sqlchemy.In(q.Field("status"), []string{STORAGE_ENABLED, STORAGE_ONLINE})).
Filter(sqlchemy.IsTrue(q.Field("enabled")))
}
managerStr := jsonutils.GetAnyString(query, []string{"manager", "provider", "manager_id", "provider_id"})