opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,136 Commits 27 Branches 687 Tags
8ef86da0de5e366ba51558662d8a4cfdfee4216a
Commit Graph
38 Commits
Author SHA1 Message Date
Qiu Jian 17175bc0a4 改进：1. 部署VM时注入全局和项目公钥 2. 完善keypair的创建和导入功能 3. 
其他
 2018-10-11 23:04:42 +08:00
邱剑 69ba3c9888 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '94032d6c14a8db76e911fab78cfe21416e729cbc':
  hosts: fix possible nil memory access issue
 2018-09-25 20:44:40 +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
屈轩 c60ca1d6eb resolve conflict 2018-09-15 14:07:45 +08:00
屈轩 c09a63442f Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure 2018-09-15 14:02:21 +08:00
Zexi Li 27f7e0d55f region: capabilities add specs 2018-09-15 10:15:02 +08:00
Zexi Li 2ea45a7120 region: spec handler 2018-09-15 01:49:11 +08:00
Qiu Jian f7769ef1e3 修正：1. 阿里云rebuild root重构 2. 其他一些fix 2018-09-14 01:15:41 +08:00
屈轩 ac979bc8c1 Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure 2018-09-13 16:22:53 +08:00
邱剑 48dd7ffe37 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '883f321db71934a59d6b789d3febf7d8f5579def':
  避免只使用第一个storage
 2018-09-12 19:29:08 +08:00
屈轩 f3b4b4d314 避免只使用第一个storage 2018-09-12 16:12:47 +08:00
屈轩 20381d0775 resolve conflict 2018-09-12 15:28:34 +08:00
屈轩 224193248f resolve conflict 2018-09-11 16:39:49 +08:00
wanyaoqi bf71e62224 regionv2 support vnc connect baremetal 2018-09-06 12:13:08 +08:00
Qiu Jian f4f2d8fb97 浮动IP支持 2018-09-04 23:04:29 +08:00
屈轩 1ba5db64cd 添加azure云盘创建代码 2018-08-31 16:29:54 +08:00
屈轩 a75dc1b729 Merge branch 'release/2.1.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure 2018-08-29 10:38:55 +08:00
wanyaoqi d113017c33 remove temp code 2018-08-24 22:41:24 +08:00
wanyaoqi 5de6220a74 server shot desc 2018-08-24 22:25:33 +08:00
李泽玺 6e462735ac Merge pull request #70 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/lzx-resolve-conflict-2.1.0-2018-08-17 to release/2.1.0 
* commit '13aa7b81e97bec8fe41aff9f4cb8cbb7169a674e':
  - climc: 设置 option 没有 subcommand 的情况下进入交互模式, 代码逻辑变清晰 - make fmt
 2018-08-23 22:07:27 +08:00
屈轩 97877eb3f6 多账号同步依赖manager_id区分 2018-08-15 15:18:46 +08:00
Zexi Li 090a9c5e86 Merge branch 'release/2.0.0' of ssh://git.yunion.io/~lizexi/onecloud into release/2.1.0 2018-08-11 15:11:24 +08:00
Zexi Li 22411ffb53 path move: github.com/yunionio -> yunion.io/x 2018-08-11 14:28:18 +08:00
李泽玺 cbd1b1c6aa Merge pull request #31 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/kvm-server-create to release/2.1.0 
* commit 'c0a213556796acd2854a298fd5b2df3abd7e6ef8':
  kvm server create
 2018-08-11 10:29:31 +08:00
wanyaoqi c0a2135567 kvm server create 2018-08-11 10:21:28 +08:00
Qiu Jian 6d81914119 Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-release-2.1.0-conflict-resolve-20180810 
Conflicts:
	pkg/cloudcommon/db/taskman/subtasks.go
	pkg/compute/models/guests.go
 2018-08-10 12:15:04 +08:00
Qiu Jian f0ec8a563e 修正：1. 删除VPC导致hostwire数据不一致问题 2. 阿里云主机无操作系统信息 
3. 其他一些BUGfix
 2018-08-09 17:49:17 +08:00
Zexi Li 02edf9d464 Merge branch 'release/2.0.0' of ssh://git.yunion.io/yunionio/onecloud into hotfix/lzx-dns-auto-merge-210 2018-08-07 21:00:51 +08:00
wanyaoqi bbe38254b9 add region in server details 2018-08-06 19:35:13 +08:00
Zexi Li 217f5a65ef - k8s client util 
- dns config sample
 2018-08-06 12:08:29 +08:00
屈轩 896ea27aca 解决合并冲突 2018-08-03 16:03:49 +08:00
屈轩 9d0608378e add disk-op code 2018-08-02 14:52:24 +08:00
wanyaoqi c3f5d0b194 first commit 2018-08-01 15:01:39 +08:00
Zexi Li b5275a0c29 - mv mcclient to pkg/mcclient 
- vendor update
 2018-08-01 14:13:23 +08:00
Qiu Jian fcee2de326 修正：1. 由于系统盘大小设置单位未转换，导致阿里云创建主机失败 2. 
伪删除阿里云主机后，detach了系统盘，导致主机恢复后无系统盘 3.
修正一些格式错误 4. 补充一些climc命令
 2018-07-31 00:42:18 +08:00
Zexi Li 37624f11e2 Add region service. 2018-07-30 12:27:27 +08:00
Zexi Li 8ba5ffe1b4 compute models added. 2018-07-27 20:44:26 +08:00
Zexi Li 976cc8e640 cloudcommon pkg added. 2018-07-27 19:03:32 +08:00