Commit Graph
245 Commits
Author SHA1 Message Date
Qiu Jian 9f35039209 add service tag for actionlog 2019-02-18 01:13:40 +08:00
Qiu Jian 8554d13c4a make fmt 2019-02-16 15:17:31 +08:00
Qiu Jian 066d155a16 fix: logger did not record start time of events 2019-02-16 13:47:18 +08:00
Qiu Jian f2e97ff272 Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190215
Conflicts:
	pkg/compute/guestdrivers/esxi.go
	pkg/compute/guestdrivers/openstack.go
2019-02-15 19:47:56 +08:00
邱剑 256b6e9841 Automatic merge from release/2.4.0 -> release/2.5.0
* commit '220df08a486d2a5e725c64e3f7cc42437c7ca41f':
  log日志记录external_id
2019-02-15 12:11:56 +08:00
邱剑 220df08a48 Automatic merge from release/2.3.0 -> release/2.4.0
* commit 'ab97a01b9ccaaa1b2af46fd9bc744e256ccea69e':
  log日志记录external_id
2019-02-15 12:11:55 +08:00
屈轩 2d7a17464c log日志记录external_id 2019-02-15 11:56:12 +08:00
邱剑 d0f2bfcad0 Automatic merge from release/2.5.0 -> release/2.6.0
* commit 'e38f007c512e27f00630a34629006067660b6db8':
  implement baremetal host driver
  minor updates
2019-02-13 18:26:58 +08:00
李泽玺 3021e37e87 Automatic merge from release/2.5.0 -> release/2.6.0
* commit '9d6a769c8b0afe2fc5b9126f749135cf70fcd7ae':
  baremetal: host convert failed
  fix: recode host convert codes to fix scheduler failure issues
2019-02-13 15:48:21 +08:00
Qiu Jian b11f117781 minor updates 2019-02-13 15:38:30 +08:00
Zexi Li 1fe2bbe0e0 baremetal: host convert failed 2019-02-13 15:10:10 +08:00
Qiu Jian 924ae176b8 fix: recode host convert codes to fix scheduler failure issues 2019-02-13 14:51:05 +08:00
Qiu Jian 5c9be39f52 log doCreateItem exceptions 2019-02-12 17:08:23 +08:00
Qiu Jian ddc42ce54e add action-show admin mode parameter 2019-02-12 16:29:26 +08:00
Qiu Jian eaeb41a2d7 fix misc logger bugs 2019-02-12 14:50:58 +08:00
邱剑 808347aed1 Merge pull request #1018 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-notify-with-template to release/2.6.0
* commit '44faf10bfd78537d97c921867e3316a216f59147':
  update influxdb in a more graceful manner
  removel logs
  minor fixes
  增加:补充完整通知消息功能
2019-02-11 23:04:17 +08:00
邱剑 cf1d09ad66 Merge pull request #1006 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/log-service-golang to release/2.6.0
* commit 'bb5aa4d3155c5dd6aca6ed06644c6e95bef8b742':
  minor updates
  update systemd unit description
  add logger rpm build scripts
  minor fixes
  logger service, half baked, needs more work
2019-02-11 20:59:08 +08:00
Qiu Jian 89c2421bf7 minor fixes 2019-02-11 08:46:06 +08:00
Qiu Jian b215c199df minor fixes 2019-02-09 06:23:23 +08:00
Qiu Jian 77b95af988 feature:
1. change SERVER_TYPE_* to NETWORK_TYpE_*
2. add NETWORK_TYPE_PXE and NETWORK_TYPE_IPMI specifically for baremetal PXE and IPMI
network allocation
2019-01-29 23:38:15 +08:00
Qiu Jian 4cd39a70c0 1.
增加server-change-ipaddr接口,允许在运行和关机更换主机的IP地址。
2. 允许主机加入一个network多次(目前允许2次)
2019-01-27 00:30:43 +08:00
屈轩 53b03c1d59 添加监听同步配置操作 2019-01-25 15:00:05 +08:00
Qiu Jian c9a6bfa9e0 改进:1. 创建主机时可以绑定指定eip,或者新建eip并且绑定。2.
取消绑定eip时候可以自动删除eip
2019-01-23 12:26:48 +08:00
邱剑 53211bdb46 Merge pull request #950 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-create-server-with-native-images to release/2.6.0
* commit '9df351b5f9b8788e9ff43577816c551df8ac3567':
  make fmt import
  minor fixes for vmware
  补充esxi相关功能
  fixes for qcloud&azure
  改进:获取azure官方镜像, 还缺少使用azure官方镜像创建主机的支持
  增加:1. 将公有云标准镜像同步到本地 2. 可以从公有云标准镜像创建主机 3. 在公有云缓存镜像时遵守公有云镜像的配额
2019-01-23 00:07:33 +08:00
屈轩 b9dd5052ca 冲突解决 2019-01-22 16:29:08 +08:00
邱剑 6f732d1edc Automatic merge from release/2.3.0 -> release/2.4.0
* commit '0aafe01ee8d8934f54b75b1c2366c5dd72857101':
  避免project未找到直接返回err
2019-01-22 16:18:37 +08:00
屈轩 3e4b8fed08 避免project未找到直接返回err 2019-01-22 16:17:10 +08:00
Qiu Jian beb2ac66b5 增加:1. 将公有云标准镜像同步到本地 2. 可以从公有云标准镜像创建主机 3.
在公有云缓存镜像时遵守公有云镜像的配额
2019-01-21 09:21:02 +08:00
Qiu Jian 706238404e 修正:1. 包年包月资源池添加和减少操作需要做状态检查 2.
同步时候忽略包年包月资源次的host和storage
2019-01-11 21:13:40 +08:00
Qiu Jian 06c9e6eb7e make fmt 2019-01-09 20:56:31 +08:00
Qiu Jian 606802b582 修正:1. attach权限校验总是false 2. 增加climc user
default_project_id相关方法
2019-01-09 20:49:26 +08:00
Qiu Jian e3766653f6 修正:1. allowattach rbac compatible 2. server insert iso fail 2019-01-09 10:27:30 +08:00
邱剑 397c7f1e69 Merge pull request #894 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fetch-by-global-unique-name to release/2.5.0
* commit 'ceaa929cdd844d18c28da14c84592afdf1417648':
  在名称不冲突的情况下,允许非owner用户使用name访问资源
2019-01-07 21:49:46 +08:00
邱剑 a6e3d788cb Automatic merge from release/2.4.0 -> release/2.5.0
* commit '0dabca78396cdd8dc0339acc3f2049422e417d2f':
  add network merge split
2019-01-07 21:49:32 +08:00
wanyaoqi 33120a005a add network merge split 2019-01-05 22:37:21 +08:00
邱剑 143083d2cf Merge pull request #883 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-storage-cache-image-missing-format to release/2.5.0
* commit 'e5aa26f0afbfadc847e4399a19ae798eafac0d57':
  修正:1. storagecache.CacheImage接口需要指定format 2. PerformAction默认返回ActionNotFound Error
2019-01-05 20:14:39 +08:00
Qiu Jian ceaa929cdd 在名称不冲突的情况下,允许非owner用户使用name访问资源 2019-01-05 17:47:30 +08:00
Qiu Jian 6744fb8a4a server-create创建prepaid主机,增加auto_prepaid_recycle参数,创建后自动加入包年包月资源池 2019-01-05 17:28:34 +08:00
Qiu Jian e5aa26f0af 修正:1. storagecache.CacheImage接口需要指定format 2.
PerformAction默认返回ActionNotFound Error
2019-01-04 17:36:54 +08:00
邱剑 3f08aab84a Automatic merge from release/2.4.0 -> release/2.5.0
* commit 'f9202677218c02f3f5e7683a7ccab25c1db2d7db':
  host-list增加mem_cmtbound
  disk add allowdeleteitem
  修正:1. 删除伪删除主机、磁盘需要override-pending-delete参数 2. joint-update支持auto_create参数 3. 删除主机时候detach磁盘,清理安全组
2019-01-04 13:16:49 +08:00
Qiu Jian 5b63de31bc 修正:1. 删除伪删除主机、磁盘需要override-pending-delete参数 2.
joint-update支持auto_create参数 3. 删除主机时候detach磁盘,清理安全组
2019-01-03 19:39:22 +08:00
Qiu Jian 018e372173 minor fixes 2018-12-29 13:43:49 +08:00
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