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
3,339 Commits 27 Branches 687 Tags
df41b7cdcd88f6b4e67eb3cd97bc4a15e43afdcc
Commit Graph
203 Commits
Author SHA1 Message Date
Qiu Jian df41b7cdcd use separate worker for long running tasks, such as ImageConvertTask, 
ImageCheckTask, CloudProviderSyncInfoTask
 2018-12-27 16:19:24 +08:00
Qiu Jian cd3f46871a minor fixes 2018-12-27 00:05:57 +08:00
Qiu Jian 88566645e0 add doc.go && make ParseOptions changes 
Conflicts:
	pkg/cloudcommon/options.go
	pkg/compute/service/service.go
	pkg/webconsole/service/service.go
	pkg/yunionconf/service/service.go
 2018-12-26 22:59:08 +08:00
Qiu Jian 2e587bd6ab glance重构 update 1 
Conflicts:
	Gopkg.lock
	pkg/appsrv/appsrv.go
	pkg/cloudcommon/options.go
	pkg/compute/models/hosts.go
	pkg/compute/models/quotas.go
	pkg/compute/service/service.go
	pkg/mcclient/mcclient.go
 2018-12-26 22:52:13 +08:00
邱剑 83a529f234 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'f10b31c0bdee8e6d1f2d4cfa5457d83cc0256f82':
  client session add context
 2018-12-25 15:25:52 +08:00
wanyaoqi 742a67b0f8 client session add context 2018-12-25 13:33:33 +08:00
邱剑 ec77b6928b Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '09c830d67dc466a2ff86947e58af74ab6ca793e3':
  在rowsToArray中进行defer rows.Close()
  修正：1. sql.Rows使用后未关闭，导致占用db链接 2. 服务启动后，调用AppDBInit方法设置db连接池上限，避免耗尽mysql连接 3. app和workmanager增加db属性，用来标示该worker和app是否使用数据库，从而估计需要设置的数据库连接的上限
 2018-12-21 22:14:46 +08:00
Qiu Jian a6b865e7a2 修正：1. sql.Rows使用后未关闭，导致占用db链接 2. 
服务启动后，调用AppDBInit方法设置db连接池上限，避免耗尽mysql连接
3.
app和workmanager增加db属性，用来标示该worker和app是否使用数据库，从而估计需要设置的数据库连接的上限
 2018-12-21 17:10:34 +08:00
屈轩 fcdf62a4d6 支持同步公有云负载均衡信息同步 2018-12-15 13:58:18 +08:00
Qiu Jian 739ef05c86 minor fixes 2018-12-14 00:00:56 +08:00
Qiu Jian e18302866b 1. GetShortDesc()改为GetShortDesc(ctx context.Context) 
2.
VirtualResource的GetShortDesc()中增加owner_tenant_id和owner_tenant两个字段
 2018-12-13 23:55:51 +08:00
Qiu Jian cc7da24faa Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-vm-resource-pooling 2018-12-10 01:08:09 +08:00
Qiu Jian 75701657d0 fix bugs 2018-12-07 21:18:52 +08:00
Qiu Jian 1f5ab8750f add task locks 2018-12-07 09:24:12 +08:00
Qiu Jian 965e84ea36 update 2018-12-07 02:57:58 +08:00
邱剑 90f7684910 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '7c4dc384ccf856fe1583e8677a2df8496b2057de':
  避免未能及时释放usage quota
 2018-12-06 22:35:31 +08:00
邱剑 7c4dc384cc Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '72bad82f1706c85787b24e3750a776c70b68d8d0':
  避免未能及时释放usage quota
 2018-12-06 22:35:31 +08:00
邱剑 72bad82f17 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '9e7e48550688c61f414f8e62e8d3dc19d267fa61':
  避免未能及时释放usage quota
 2018-12-06 22:35:30 +08:00
屈轩 fbb12d1216 避免未能及时释放usage quota 2018-12-06 22:30:10 +08:00
Yousong Zhou 9fc85e4df6 standalone: 将ExternalId设置为list:"user" 
ExternalId已经可以通过接口从别处获取，不必再限制为admin only
 2018-12-06 07:51:12 +00:00
Qiu Jian 669081f7f3 Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-vm-resource-pooling 2018-12-05 01:14:45 +08:00
Qiu Jian 3e87c17e72 support prepaid server create and renew 2018-12-05 00:40:15 +08:00
邱剑 293a43ee27 Merge pull request #653 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-baremetal-api to release/2.4.0 
* commit '5dceb2685ca3a3c078f303ad8328c90ca43d6c8b':
  region: fix host enable not clean sched cache
  fix BaremetalSyncAllGuestsStatusTask
  region: baremetal api compatible
  region: baremetal api compatible
 2018-12-04 20:44:43 +08:00
Zexi Li 5dceb2685c region: fix host enable not clean sched cache 2018-12-04 18:52:17 +08:00
李泽玺 3f3f1701c2 Merge pull request #1 in ~LIZEXI/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/fix-BaremetalSyncAllGuestsStatusTask to bugfix/lzx-baremetal-api 
* commit 'ea81fa26dbcb56eefe131387b2fab8c3b731029d':
  fix BaremetalSyncAllGuestsStatusTask
  region: baremetal api compatible
 2018-12-04 18:09:07 +08:00
Yousong Zhou 5a092d203c db_dispatcher: 移除对listFields的调试日志 2018-12-03 13:44:46 +00:00
Yousong Zhou 273f26848b cloudcommon: models: 注册modelMan时检查crud tag值 2018-12-03 13:44:46 +00:00
Zexi Li 1b3d33986b region: baremetal api compatible 2018-12-03 20:04:30 +08:00
Zexi Li 22050bca71 region: baremetal api compatible 2018-12-03 18:51:06 +08:00
Qiu Jian c292a1e311 Merge branch 'release/2.3.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.4.0-20181203 
Conflicts:
	pkg/compute/models/storages.go
 2018-12-03 07:18:27 +08:00
wanyaoqi ecc750107b fix conflict 2018-12-01 16:18:11 +08:00
TangBin a543901e2f yunionconfig build error fix 2018-12-01 14:52:01 +08:00
Qiu Jian e42f1a7744 recode 2018-12-01 12:05:41 +08:00
Qiu Jian 334f3605ba minor fixes 2018-12-01 00:42:29 +08:00
Qiu Jian bc02b3b433 1. 
取消userCred.IsSystemAdmin()，在使用policy的应用中，通过userCred.IsAdminAllow判断是否是管理员且具备相应的权限。获取token时，需要传入policy.FilterPolicyCredential，将普通userCred转换成支持rbac的userCred
2. 在应用启动时候，必须设置 SetServiceType，否则退出
 2018-11-30 23:00:11 +08:00
邱剑 5d3006c971 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'b4150df337286fbfa40597d7247a8e9b594f152c':
  修正rbac，非管理模式下权限有deny, owner, user, guest四个级别，管理模式下，有deny, allow两个级别。只有非管理模式下，才会应用缺省的权限设置。
 2018-11-30 13:56:01 +08:00
Qiu Jian 2f22ebe0a8 修正rbac，非管理模式下权限有deny, owner, user, 
guest四个级别，管理模式下，有deny,
allow两个级别。只有非管理模式下，才会应用缺省的权限设置。
 2018-11-29 23:13:53 +08:00
Yousong Zhou 49382934e5 treewide: 保留httperrors的格式 2018-11-28 07:33:22 +00:00
Yousong Zhou 151da754d3 dispatchers: 使用httperrors.NewResourceNotFoundError2() 2018-11-28 07:26:15 +00:00
Qiu Jian a964836953 Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-esxi-support-complete 2018-11-26 15:04:27 +08:00
邱剑 00e001d981 Merge pull request #471 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/guest-disks-backup to release/2.4.0 
* commit 'e64b71818b9f32f49ece1accce7adf011d12a4e1':
  region: support create backup guest; scheduler: support backup guest schedule
 2018-11-26 13:45:08 +08:00
Qiu Jian dcbc3daf49 Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-esxi-support-complete 2018-11-25 08:27:09 +08:00
Qiu Jian 94c49ded2e esxi support 2018-11-25 08:21:24 +08:00
邱剑 be38bf62f3 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'b70be6be0f4007fea7b93b039c77d37a6e6f6208':
  避免localtask failed时error一直是Task failed due to unknown remote errors
 2018-11-23 20:22:07 +08:00
邱剑 c8bc4c0598 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'be38bf62f3bb8444948a1fdbc267553fc884a8e1':
  避免localtask failed时error一直是Task failed due to unknown remote errors
 2018-11-23 20:22:07 +08:00
邱剑 a087c33c88 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'c8bc4c0598bb35f4c26245ebd503428f5a72a1e4':
  避免localtask failed时error一直是Task failed due to unknown remote errors
 2018-11-23 20:22:07 +08:00
屈轩 58962cf2d2 避免localtask failed时error一直是Task failed due to unknown remote errors 2018-11-23 19:07:20 +08:00
Qiu Jian 46b67e9dc9 minor updates 2018-11-23 15:03:22 +08:00
Qiu Jian f2522b980c 1. resize opslog notes to VARCHAR(2048) 2. cloudaccount sync status 
check
 2018-11-23 09:48:50 +08:00
邱剑 6b2d42d7b9 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '5f79b66ced502b82c999a0437e3fa1db3f196f59':
  改为补一条START日志
  Change workermanager backlog to 1024
  remove old log
  修正：在同步完vm的网络和磁盘信息后，再记录同步的日志
 2018-11-23 02:05:09 +08:00