opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-28 03:23:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9527 from swordqiu/hotfix/qj-split-table-empty-panic

Browse Source 
fix(cloudcommon): panic when query an empty splitable model manager
This commit is contained in:
Zexi Li
2020-12-20 02:07:45 +08:00
committed by GitHub
parent 260e92b109 d01f89a2c8
commit 972f7f4ab4
5 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/db_dispatcher.go
+6 -1
View File
@@ -611,7 +611,12 @@ func ListItems(manager IModelManager, ctx context.Context, userCred mcclient.Tok
}
union, err := sqlchemy.UnionWithError(subqs...)
if err != nil {
return nil, errors.Wrap(err, "sqlchemy.UnionWithError")
if errors.Cause(err) == sql.ErrNoRows {
emptyList := modulebase.ListResult{Data: []jsonutils.JSONObject{}}
return &emptyList, nil
} else {
return nil, errors.Wrap(err, "sqlchemy.UnionWithError")
}
}
q = union.Query()
} else {