opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-01 15:07:17 +08:00
Code Issues Packages Projects Releases Wiki Activity
613 Commits 27 Branches 670 Tags
abd31a2fb8c9622d5b0d531b3df914101832eb33
Commit Graph

613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
邱剑 abd31a2fb8 Merge pull request #255 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-cloudprovider-sum-guest to release/2.1.0 
* commit '873724b1fbdef79890367951896768b24fd849e7':
  cloudprovider返回虚机数量信息
 2018-09-27 18:26:34 +08:00
屈轩 873724b1fb cloudprovider返回虚机数量信息 2018-09-27 18:20:44 +08:00
邱剑 c2eaabf964 Merge pull request #253 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-interface to release/2.1.0 
* commit '03653febc708d5337024dc88aaaf2165c0d9c43d':
  补充modules interface
 2018-09-27 16:06:52 +08:00
屈轩 03653febc7 补充modules interface 2018-09-27 12:04:13 +08:00
邱剑 4e7702f0ae Merge pull request #250 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-secgroup to release/2.1.0 
* commit '13c576672baa713385c7a14fabf73aca4ec91f85':
  避免私有云安全组规则下发不完成,ruleset后面补充
 2018-09-26 15:48:06 +08:00
屈轩 13c576672b 避免私有云安全组规则下发不完成,ruleset后面补充 2018-09-26 15:30:39 +08:00
邱剑 94032d6c14 Merge pull request #247 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-host-with-nil-baremetalnetwork to release/2.1.0 
* commit '8e2e19fde9b3d92e41b3b0fad740b44d7608afed':
  hosts: fix possible nil memory access issue
 2018-09-25 20:44:40 +08:00
邱剑 4917e76ece Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '3aec2d3b3920c8115b24ba1663b5d653f57f090b':
  避免assign-secgrp参数传递不一致
 2018-09-25 20:41:41 +08:00
邱剑 3aec2d3b39 Merge pull request #246 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-sec-op to release/2.0.0 
* commit '7744547c5e6cb091269c2296047d265f8163e0b3':
  避免assign-secgrp参数传递不一致
 2018-09-25 20:41:41 +08:00
Yousong Zhou 8e2e19fde9 hosts: fix possible nil memory access issue 
The code allows the existence of a netinterface to exist without
baremetalnetwork info, yet the host-show does not take into account this
relaxation.  Log the error instead of throwing runtime error bomb

[E 180920 04:21:34 appsrv.(*WorkerManager).execCallback.func1(workers.go:64)] WorkerManager exec callback error: runtime error: invalid memory address or nil pointer dereference
goroutine 160 [running]:
runtime/debug.Stack(0xc420789858, 0x527d43, 0x12cec16)
        /home/yunion/.usr/go/goroot-1.10.4/src/runtime/debug/stack.go:24 +0xa7
runtime/debug.PrintStack()
        /home/yunion/.usr/go/goroot-1.10.4/src/runtime/debug/stack.go:16 +0x22
yunion.io/x/onecloud/pkg/appsrv.(*WorkerManager).execCallback.func1(0xc420958440)
        /home/yunion/go/src/yunion.io/x/onecloud/pkg/appsrv/workers.go:65 +0x9e
panic(0x1021780, 0x1dcd4e0)
        /home/yunion/.usr/go/goroot-1.10.4/src/runtime/panic.go:502 +0x229
yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils.(*JSONDict).SortedKeys(0x0, 0xc4202cbd7b, 0x0, 0x0)
        /home/yunion/go/src/yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils/jsonutils.go:521 +0x37
yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils.(*JSONDict).String(0x0, 0xc4202cbc5b, 0x0)
        /home/yunion/go/src/yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils/jsonutils.go:533 +0x5a
yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils.(*JSONArray).String(0xc4206145a0, 0xc42046453a, 0x0)
        /home/yunion/go/src/yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils/jsonutils.go:610 +0x6b
yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils.(*JSONDict).String(0xc42000e388, 0xc42046423a, 0x0)
        /home/yunion/go/src/yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils/jsonutils.go:540 +0xd4
yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils.(*JSONDict).String(0xc42000e3b8, 0x1294d5d, 0xc)
        /home/yunion/go/src/yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils/jsonutils.go:540 +0xd4
yunion.io/x/onecloud/pkg/appsrv.SendJSON(0x13b44c0, 0xc42088e1e0, 0x13c2740, 0xc42000e3b8)
        /home/yunion/go/src/yunion.io/x/onecloud/pkg/appsrv/send.go:27 +0x84
yunion.io/x/onecloud/pkg/appsrv/dispatcher.getHandler(0x13b6740, 0xc4207501b0, 0x13b44c0, 0xc42088e1e0, 0xc42010a000)
        /home/yunion/go/src/yunion.io/x/onecloud/pkg/appsrv/dispatcher/dispatcher.go:165 +0x46a
yunion.io/x/onecloud/pkg/mcclient/auth.Authenticate.func1(0x13b6740, 0xc42088e360, 0x13b44c0, 0xc42088e1e0, 0xc42010a000)
        /home/yunion/go/src/yunion.io/x/onecloud/pkg/mcclient/auth/middleware.go:33 +0x1ba
yunion.io/x/onecloud/pkg/appsrv.(*Application).defaultHandle.func1()
        /home/yunion/go/src/yunion.io/x/onecloud/pkg/appsrv/appsrv.go:271 +0x4a5
yunion.io/x/onecloud/pkg/appsrv.(*WorkerManager).execCallback(0xc4202c8340, 0xc420958440)
        /home/yunion/go/src/yunion.io/x/onecloud/pkg/appsrv/workers.go:72 +0x50
yunion.io/x/onecloud/pkg/appsrv.(*WorkerManager).workerRun(0xc4202c8340, 0x1)
        /home/yunion/go/src/yunion.io/x/onecloud/pkg/appsrv/workers.go:49 +0x78
created by yunion.io/x/onecloud/pkg/appsrv.(*WorkerManager).schedule
        /home/yunion/go/src/yunion.io/x/onecloud/pkg/appsrv/workers.go:84 +0xcc
 2018-09-25 07:49:25 +00:00
屈轩 7744547c5e 避免assign-secgrp参数传递不一致 2018-09-25 15:26:26 +08:00
邱剑 3ad67f0845 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'b93d949e9d9e0ebe985b60775655af5276728428':
  zhengjiajie add the post method of project_host
 2018-09-20 19:33:48 +08:00
邱剑 b93d949e9d Merge pull request #242 in YUNIONIO/onecloud from ~ZHENGJIAJIE/onecloud:bugfix/add-projecthost to release/2.0.0 
* commit '8716cf3122a6b5c5e38ae5970d889ff8bf9b5c8f':
  zhengjiajie add the post method of project_host
 2018-09-20 19:33:47 +08:00
zhengjiajie 8716cf3122 zhengjiajie add the post method of project_host 2018-09-20 19:10:51 +08:00
邱剑 7d019f0e45 Merge pull request #237 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-secgroup-sync to release/2.1.0 
* commit '3d64601d3978dd1571eba13f179396d33707c1a9':
  避免同步出现重复安全组
 2018-09-20 18:21:55 +08:00
屈轩 3d64601d39 避免同步出现重复安全组 2018-09-20 15:14:55 +08:00
李泽玺 24e0f1867f Merge pull request #240 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-update-container-mem to release/2.1.0 
* commit '79efc7e2d5e17cbcf84d415d9b017c355bf9540e':
  region: guest min memory size to 8MB
 2018-09-20 12:26:31 +08:00
Zexi Li 79efc7e2d5 region: guest min memory size to 8MB 2018-09-20 11:34:46 +08:00
邱剑 901eed81b8 Merge pull request #239 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-aliyun-server-add-manager-fields to release/2.1.0 
* commit '6fbc45922c0036aa5ecc19c9f62ba801ce50783d':
  Managed server (aliyun) add manager/manager_id fields
 2018-09-20 11:14:23 +08:00
Qiu Jian 6fbc45922c Managed server (aliyun) add manager/manager_id fields 2018-09-20 11:12:14 +08:00
邱剑 f30c554c02 Merge pull request #235 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-secgroup-sync to release/2.1.0 
* commit '4e0c44d9cd5c6b528fcb0cc9f909c6fb2bbc91a8':
  避免使用同一个secgroup
 2018-09-19 16:58:15 +08:00
屈轩 4e0c44d9cd 避免使用同一个secgroup 2018-09-19 16:56:25 +08:00
邱剑 f41931f252 Merge pull request #234 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-disk-create-index to release/2.1.0 
* commit '26e1f888570b7a4d25a1184e4d1351ec2421470f':
  修复磁盘类型颠倒问题
 2018-09-19 14:43:40 +08:00
邱剑 7d973135b3 Merge pull request #233 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-update-container-mem to release/2.1.0 
* commit '040722ac8c5959805555ca91472efd1e30742f24':
  region: ignore status to update container cpu and memory
 2018-09-19 14:28:38 +08:00
屈轩 26e1f88857 修复磁盘类型颠倒问题 2018-09-19 13:48:51 +08:00
Zexi Li 040722ac8c region: ignore status to update container cpu and memory 2018-09-19 11:55:18 +08:00
邱剑 923a5490f9 Merge pull request #231 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-k8s-batch-delete to release/2.1.0 
* commit '56e24ec2185c28b3d60982a48993b21fed24edb9':
  climc: batch delete k8s resource
 2018-09-18 16:26:31 +08:00
Zexi Li 56e24ec218 climc: batch delete k8s resource 2018-09-18 16:08:21 +08:00
邱剑 06af20eb4b Merge pull request #229 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-cloudcommon-minors to release/2.1.0 
* commit '9efad3e41701e84655d1d081e920daec85e1e73d':
  cloudcommon: virtualresource: allow setting is_system on creation
  cloudcommon: db: more readable log on sql error
 2018-09-18 12:31:01 +08:00
Yousong Zhou 9efad3e417 cloudcommon: virtualresource: allow setting is_system on creation 
We have validation against the field yet the rule tag metadata does not
actually allow it
 2018-09-18 04:04:04 +00:00
邱剑 fadc94ebe1 Merge pull request #228 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-disable-aliyun-provider-cache to release/2.1.0 
* commit '9c1c3c0a70662d7276ba7f476969c1ddb9f92f63':
  阿里云：不缓存阿里云的连接
 2018-09-18 11:54:49 +08:00
Yousong Zhou 284ebcfaab cloudcommon: db: more readable log on sql error 2018-09-18 03:53:22 +00:00
周有松 0620ebe7a4 Merge pull request #226 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:feature/yousong-printjson-tabs to release/2.1.0 
* commit 'b39963bbfcc47e52eb726b3228ee381710837ddc':
  climc: add printObjectRecursive()
  printutils: add PrintJSONObjectRecursive()
  dep: make dep ensure
 2018-09-18 11:40:29 +08:00
Yousong Zhou b39963bbfc climc: add printObjectRecursive() 2018-09-18 03:39:22 +00:00
Yousong Zhou 946c0d935e printutils: add PrintJSONObjectRecursive() 
E.g. Print

	{"params": {"vrrp":{"advert_int":1,"interface":"br0","pass":"YunionLB","priority":100,"virtual_router_id":100}}}

Will have the following result

	| params.vrrp.advert_int        | 1
	| params.vrrp.interface         | br0
	| params.vrrp.pass              | YunionLB
	| params.vrrp.priority          | 100
	| params.vrrp.virtual_router_id | 100
 2018-09-18 03:39:22 +00:00
Yousong Zhou fbc16d9ce3 dep: make dep ensure 
- jsonutils: DeepCopy support
 - prettytable: allow for tabs in cell
 - structarg: bugfixes
 2018-09-18 03:39:22 +00:00
邱剑 5ddb796c9d Merge pull request #227 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-support-excel-export to release/2.1.0 
* commit 'ad83b42b1a32cdfaf6aec33a783c9c142d13610c':
  不序列化export_file和export_texts
  修正：qutoa的images使用量不准确
  支持将list的结果导出为excel文件
 2018-09-18 10:26:15 +08:00
Qiu Jian ad83b42b1a 不序列化export_file和export_texts 2018-09-18 09:46:59 +08:00
Qiu Jian 9c1c3c0a70 阿里云：不缓存阿里云的连接 2018-09-17 23:51:07 +08:00
Qiu Jian 70be87bbe5 修正：qutoa的images使用量不准确 2018-09-17 22:36:50 +08:00
Qiu Jian 03af1fc8a2 支持将list的结果导出为excel文件 2018-09-17 22:36:08 +08:00
邱剑 6061860fed Merge pull request #224 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/lzx-usage-port to release/2.1.0 
* commit '047217a52d80963842e3729ec6bc5cf1e33715ef':
  region: add network port usage
 2018-09-17 12:31:25 +08:00
Zexi Li 047217a52d region: add network port usage 2018-09-17 12:19:22 +08:00
邱剑 1a733935b2 Merge pull request #223 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-eip-bugfix-20180915 to release/2.1.0 
* commit 'c2111bcc6e3cd72dc69ce5816e71ee6f86954071':
  修正：eip操作失败后没有正确恢复状态
 2018-09-17 11:43:57 +08:00
邱剑 183e1ec0ab Merge pull request #222 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-minors to release/2.1.0 
* commit '9943fe6491a1c87569d9bb0804cd5b6cc0478737':
  cloudcommon: resourcebase: add UpdateVersion to list columns
  cloudcommon: statusstandalone: allow specifying status on creation
 2018-09-17 10:51:42 +08:00
Qiu Jian c2111bcc6e 修正：eip操作失败后没有正确恢复状态 2018-09-17 09:16:49 +08:00
Yousong Zhou 9943fe6491 cloudcommon: resourcebase: add UpdateVersion to list columns 2018-09-15 13:59:39 +00:00
Yousong Zhou 63cd662762 cloudcommon: statusstandalone: allow specifying status on creation 2018-09-15 13:59:36 +00:00
邱剑 1bb838607b Merge pull request #220 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-bugfix-misc-20180915 to release/2.1.0 
* commit 'e460919cbe404a9cda851eabadb96cc8575fa524':
  minor fixes
  minior fixes
  guestdisk support index filter
  修正：1. 阿里云刚删除主机的IP地址不能占用 2. rebuild root no-account-init无效 3. 其他问题...
 2018-09-15 21:30:38 +08:00
Qiu Jian e460919cbe minor fixes 2018-09-15 19:44:48 +08:00