Commit Graph
13559 Commits
Author SHA1 Message Date
Zhang Dongliang 18d8292f13 host 编译跨平台兼容 2021-03-09 10:24:17 +08:00
yunion-ci-robot 28ba68f4ff Merge pull request #10346 from zexi/automated-cherry-pick-of-#10345-upstream-release-3.7
Automated cherry pick of #10345: feat(build): make multi arch manifest docker image
2021-03-08 20:17:05 +08:00
Zexi Li 549feb4f68 Merge pull request #10341 from yousong/automated-cherry-pick-of-#10340-upstream-release-3.7
Automated cherry pick of #10340: etcd: fix "fatal error: concurrent map writes"
2021-03-08 14:18:05 +08:00
Zexi Li 38244dfcc8 Merge pull request #10349 from ioito/automated-cherry-pick-of-#10348-upstream-release-3.7
Automated cherry pick of #10348: fix: add cancel expire action
2021-03-08 14:15:18 +08:00
Zexi Li ee709538e7 Merge pull request #10330 from ioito/automated-cherry-pick-of-#10329-upstream-release-3.7
Automated cherry pick of #10329: fix: optimized bucket tag
2021-03-08 14:13:40 +08:00
Zexi Li f4394a4895 Merge pull request #10335 from ioito/automated-cherry-pick-of-#10334-upstream-release-3.7
Automated cherry pick of #10334: fix: add nat sku policy
2021-03-08 14:10:40 +08:00
Zexi Li 7c6bc61dcb feat(build): make multi arch manifest docker image 2021-03-08 12:52:34 +08:00
Qu Xuan e17fca6c4b fix: add cancel expire action 2021-03-08 12:13:10 +08:00
Yousong Zhou b424a8f67d etcd: fix "fatal error: concurrent map writes"
Trace

	goroutine 1270434 [running]:
	runtime.throw(0x4b0cc5e, 0x15)
		/home/yousong/.usr/go/goroot-1.15.6/src/runtime/panic.go:1116 +0x72 fp=0xc0011151f8 sp=0xc0011151c8 pc=0x439292
	runtime.mapdelete_faststr(0x40876e0, 0xc0006a54a0, 0xc001e84200, 0x3e)
		/home/yousong/.usr/go/goroot-1.15.6/src/runtime/map_faststr.go:377 +0x34c fp=0xc001115260 sp=0xc0011151f8 pc=0x41664c
	yunion.io/x/onecloud/pkg/cloudcommon/etcd.(*SEtcdClient).Unwatch(0xc0003130e0, 0xc001e84200, 0x3e)
		/home/yousong/go/src/yunion.io/x/onecloud/pkg/cloudcommon/etcd/etcd.go:353 +0x134 fp=0xc0011152d0 sp=0xc001115260 pc=0x10031f4
	yunion.io/x/onecloud/pkg/compute/models.(*SHostHealthChecker).WatchHost(0xc000c222a0, 0x5229ca0, 0xc000122000, 0xc001fbc4e0, 0x24)
		/home/yousong/go/src/yunion.io/x/onecloud/pkg/compute/models/host_health.go:149 +0xd5 fp=0xc001115338 sp=0xc0011152d0 pc=0x1816395
	yunion.io/x/onecloud/pkg/compute/models.(*SHost).PerformOnline(0xc001fd8400, 0x5229d20, 0xc001c4d440, 0x52a0c60, 0xc000957c40, 0x5298900, 0xc001629aa0, 0x5298900, 0xc001629ae0, 0xc000957c40, ...)
		/home/yousong/go/src/yunion.io/x/onecloud/pkg/compute/models/hosts.go:3829 +0x227 fp=0xc0011153a0 sp=0xc001115338 pc=0x185a387
	yunion.io/x/onecloud/pkg/compute/models.(*SHost).PerformPing(0xc001fd8400, 0x5229d20, 0xc001c4d440, 0x52a0c60, 0xc000957c40, 0x5298900, 0xc001629aa0, 0x5298900, 0xc001629ae0, 0x0, ...)
		/home/yousong/go/src/yunion.io/x/onecloud/pkg/compute/models/hosts.go:3891 +0xbd fp=0xc001115430 sp=0xc0011153a0 pc=0x185acbd
2021-03-08 09:55:46 +08:00
yunion-ci-robot cdde5b31de Merge pull request #10337 from rainzm/automated-cherry-pick-of-#10336-upstream-release-3.7
Automated cherry pick of #10336: fix(notify): enable filter of contact type 'email' and 'mobile'
2021-03-06 10:57:27 +08:00
rainzm fb6064fa2a fix(notify): enable filter of contact type 'email' and 'mobile' 2021-03-06 03:00:44 +08:00
Qu Xuan 8e2092e18e fix: add nat sku policy 2021-03-05 17:27:26 +08:00
Qu Xuan 84f8cc1b3d fix: optimized bucket tag 2021-03-05 15:37:38 +08:00
Zexi Li 887392fe6a Merge pull request #10328 from zexi/automated-cherry-pick-of-#10327-upstream-release-3.7
Automated cherry pick of #10327: fix(cloudcommon): add default domain of common options
2021-03-05 11:22:42 +08:00
Zexi Li 772579d3e8 fix(cloudcommon): add default domain of common options 2021-03-05 11:20:23 +08:00
Zexi Li f5c1480a4f Merge pull request #10321 from ioito/automated-cherry-pick-of-#10320-upstream-release-3.7
Automated cherry pick of #10320: fix: add secgroup filter opts
2021-03-05 10:16:23 +08:00
Zexi Li 70d7bc3d3c Merge pull request #10323 from tb365/automated-cherry-pick-of-#10322-upstream-release-3.7
Automated cherry pick of #10322: copyright update brand_cn&brand_en fix
2021-03-05 10:15:19 +08:00
tangbin 43a879ccb2 copyright update brand_cn&brand_en fix 2021-03-05 10:00:09 +08:00
Zexi Li 3d5edb3628 Merge pull request #10315 from ioito/automated-cherry-pick-of-#10314-upstream-release-3.7
Automated cherry pick of #10314: fix: add nat sku provider filter
2021-03-04 21:00:33 +08:00
Zexi Li 7111e6fe4a Merge pull request #10313 from ioito/automated-cherry-pick-of-#10312-upstream-release-3.7
Automated cherry pick of #10312: fix: optimzed tag sync
2021-03-04 21:00:15 +08:00
Qu Xuan 1ae3fbc749 fix: add secgroup filter opts 2021-03-04 20:56:41 +08:00
Zexi Li 59fc9c2dea Merge pull request #10317 from rainzm/automated-cherry-pick-of-#10316-upstream-release-3.7
Automated cherry pick of #10316: fix(region): check whether guest is nil
2021-03-04 19:39:00 +08:00
rainzm 23328aa12b fix(region): check whether guest is nil 2021-03-04 17:54:52 +08:00
Qu Xuan 14246f4839 fix: add nat sku provider filter 2021-03-04 17:50:46 +08:00
Qu Xuan d7be39edf8 fix: optimzed tag sync 2021-03-04 17:31:18 +08:00
Zexi Li 0f591c3a4f Merge pull request #10311 from zhaoxiangchun/automated-cherry-pick-of-#10310-upstream-release-3.7
Automated cherry pick of #10310: bugfix(monitor): 导出信息中添加全局字典配置
2021-03-04 16:54:29 +08:00
Zexi Li 9fc5f4134d Merge pull request #10309 from tb365/automated-cherry-pick-of-#10305-upstream-release-3.7
Automated cherry pick of #10305: infos copyright add brand_en&brand_cn
2021-03-04 15:25:57 +08:00
zhaoxiangchun 839df9025a bugfix(monitor): 导出信息中添加全局字典配置
1. 域信息中添加全局字典的域配置
2021-03-04 12:13:02 +08:00
tangbin b5958bb6b9 infos copyright add brand_en&brand_cn 2021-03-04 11:21:15 +08:00
Zexi Li 2902530ff3 Merge pull request #10302 from zhaoxiangchun/automated-cherry-pick-of-#10301-upstream-release-3.7
Automated cherry pick of #10301: feat(mcclient,itsm): modify itsm mcclient rpc func
2021-03-04 10:01:10 +08:00
Zexi Li f886366d15 Merge pull request #10304 from ioito/automated-cherry-pick-of-#10303-upstream-release-3.7
Automated cherry pick of #10303: feat(region): nat op support
2021-03-04 10:00:03 +08:00
Zexi Li 08241a52c8 Merge pull request #10300 from tb365/automated-cherry-pick-of-#10299-upstream-release-3.7
Automated cherry pick of #10299: redis update tags fix
2021-03-04 09:59:52 +08:00
Qu Xuan 9dd3bb2189 feat(region): nat op support 2021-03-03 21:27:17 +08:00
zhaoxiangchun 8881be5a24 feat(mcclient,itsm): modify itsm mcclient rpc func
1.统计返回技术支持工单信息
2021-03-03 17:50:59 +08:00
Zexi Li 648cf6b44a Merge pull request #10296 from zhaoxiangchun/automated-cherry-pick-of-#10295-upstream-release-3.7
Automated cherry pick of #10295: feat(monitor): alert policy filter by res_type
2021-03-03 10:27:24 +08:00
Zexi Li ce1f86929e Merge pull request #10298 from ioito/automated-cherry-pick-of-#10297-upstream-release-3.7
Automated cherry pick of #10297: feat(region): nat op support
2021-03-03 10:26:41 +08:00
tangbin 6ae4883db2 redis update tags fix 2021-03-03 10:17:14 +08:00
Qu Xuan 18445ba433 feat(region): nat op support 2021-03-02 21:34:34 +08:00
zhaoxiangchun 3fa8520c5c feat(monitor): alert policy filter by res_type
1.增加资源类型的过滤处理
2.报警消息内容处理
2021-03-02 16:12:38 +08:00
Zexi Li f2645a2045 Merge pull request #10293 from zhaoxiangchun/automated-cherry-pick-of-#10292-upstream-release-3.7
Automated cherry pick of #10292: fix(monitor): fix monitor export err
2021-03-02 14:29:45 +08:00
zhaoxiangchun c068badd36 fix(monitor): fix monitor export err
1.修复监控导出报错
2.db_dispatcher.ListItems 方法中对exportKeys的处理新增了一个方法
2021-03-02 11:57:14 +08:00
Zexi Li 889755feae Merge pull request #10290 from swordqiu/automated-cherry-pick-of-#10289-upstream-release-3.7
Automated cherry pick of #10289: fix(keystone): adjust default system policy names
2021-03-02 10:16:59 +08:00
yunion-ci-robot 6d0f1ce7df Merge pull request #10287 from zexi/automated-cherry-pick-of-#10286-upstream-release-3.7
Automated cherry pick of #10286: fix(hostdeployer): windows rootfs umount leak
2021-03-02 10:11:21 +08:00
Zexi Li c308bdbb0c fix(hostdeployer): windows rootfs umount leak 2021-03-02 09:52:19 +08:00
yunion-ci-robot 81bc5e1f93 Merge pull request #10285 from yousong/automated-cherry-pick-of-#10284-upstream-release-3.7
Automated cherry pick of #10284: networks: server_type: do not allow update
2021-03-01 22:12:26 +08:00
Qiu Jian b034a7a95d fix(keystone): adjust default system policy names 2021-03-01 21:30:24 +08:00
Yousong Zhou c3fdda2ac1 networks: server_type: do not allow update
Transition between guest, baremetal, ipmi, eip, etc. all requires
sanity checks on relevant types allocated from the network
2021-03-01 19:09:44 +08:00
Zexi Li f7f88db7b3 Merge pull request #10209 from rainzm/automated-cherry-pick-of-#10208-upstream-release-3.7
Automated cherry pick of #10208: fix(region): pull the network correctly
2021-03-01 11:39:47 +08:00
Zexi Li 41c3c0bbe3 Merge pull request #10279 from swordqiu/automated-cherry-pick-of-#10278-upstream-release-3.7
Automated cherry pick of #10278: fix(baremetal-agent): baremetal fail to stop due to power off soft failed
2021-03-01 10:13:34 +08:00
yunion-ci-robot 7d5f0ba84e Merge pull request #10277 from yousong/automated-cherry-pick-of-#10276-upstream-release-3.7
Automated cherry pick of #10276: Bugfix/yousong cloudproxy
2021-02-27 21:53:23 +08:00