邱剑
a4ce38c4fe
Merge pull request #1013 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-image-p2p-distribution to release/2.6.0
...
* commit '4c6f196ec541d1b8c8e2d79ea69c7bd7f9fcf1a6':
temp commit
minor updates
torrent recode
2019-02-18 23:03:55 +08:00
Qiu Jian
066d155a16
fix: logger did not record start time of events
2019-02-16 13:47:18 +08:00
Qiu Jian
4c6f196ec5
Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-image-p2p-distribution
...
Conflicts:
pkg/appsrv/appsrv.go
pkg/cloudcommon/policy/defaults.go
pkg/util/sysutils/sysutils.go
2019-02-15 22:46:01 +08:00
wanyaoqi
b210add54d
fs driver fix
2019-02-14 10:23:10 +08:00
Qiu Jian
0e3f2e160c
temp commit
2019-01-30 21:06:48 +08:00
wanyaoqi
f91f33d696
fix code
2019-01-26 15:55:48 +08:00
wanyaoqi
e8306bf602
fix code
2019-01-26 15:51:15 +08:00
wanyaoqi
0865d53297
temp
2019-01-18 18:02:00 +08:00
wanyaoqi
ae6430bd04
use procutils replace exec
2019-01-17 10:46:53 +08:00
wanyaoqi
837502a068
20181204-20181205
2019-01-07 17:03:31 +08:00
Qiu Jian
cd3f46871a
minor fixes
2018-12-27 00:05:57 +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
Qiu Jian
c70201b177
temp commit
...
Conflicts:
Gopkg.lock
Gopkg.toml
vendor/yunion.io/x/pkg/util/sysutils/storagetypes.go
vendor/yunion.io/x/structarg/structarg.go
2018-12-26 22:44:03 +08:00
Yousong Zhou
ae40f39d32
appsrv: FetchStruct(): 使用jsonutils
2018-12-23 15:26:50 +00:00
邱剑
2eec38953c
Automatic merge from release/2.3.0 -> release/2.4.0
...
* commit '522697390818755e32964021e44bff63e752b8ee':
修正worker状态信息
2018-12-22 17:07:59 +08:00
邱剑
5226973908
Automatic merge from release/2.2.0 -> release/2.3.0
...
* commit '51971ebb318a750d1f2cb1fb3522dd57576d9312':
修正worker状态信息
2018-12-22 17:07:59 +08:00
屈轩
e768369181
修正worker状态信息
2018-12-22 17:05:37 +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
Yousong Zhou
dfbd27fd3a
appsrv: remove debug code
2018-12-19 13:15:59 +00:00
Yousong Zhou
a71d0518f4
appsrv: use copy() for copying slice
2018-12-19 13:15:59 +00:00
Yousong Zhou
27c9770017
appsrv: rewrite TestRadixMatchParams()
2018-12-19 13:15:59 +00:00
Yousong Zhou
e7c6b8e7a5
appsrv: fix TestWorkerManagerError()
2018-12-19 13:15:59 +00:00
Yousong Zhou
5f2fb92caf
appsrv: fix fmt verb
...
Warningf format %] has unknown verb ]
2018-12-19 13:15:59 +00:00
Yousong Zhou
e6a6a9353b
appsrv: use RWMutex for rootLock
2018-12-19 13:15:59 +00:00
邱剑
90b250c2da
Merge pull request #717 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/server-create-disk-by-snapshot to release/2.4.0
...
* commit 'ad2de3384697067d40a68e06e7870c2a9e9612b3':
fix code
add snapshot reference count, fix code
server create disk by snapshot, mount snapshot by fusefs
2018-12-12 21:15:19 +08:00
Qiu Jian
a5dfe342a1
将host resource type设置为create_optional，且default为shared
2018-12-12 11:59:31 +08:00
wanyaoqi
86b3b38f41
add snapshot reference count, fix code
2018-12-11 20:48:46 +08:00
wanyaoqi
6a6806e65b
server create disk by snapshot, mount snapshot by fusefs
2018-12-11 20:46:36 +08:00
邱剑
dcb4f12700
Merge pull request #712 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-app-params-turnoff-log-for-specific-action to release/2.4.0
...
* commit 'd8e35fb11a3d12f18484d8694fe9cdca93edf926':
context中增加SAppParams参数，允许在Modal的方法里访问http请求参数，也能控制是否日志和trace
2018-12-11 11:00:51 +08:00
Qiu Jian
d8e35fb11a
context中增加SAppParams参数，允许在Modal的方法里访问http请求参数，也能控制是否日志和trace
2018-12-10 23:39:30 +08:00
Qiu Jian
fc925e38ce
Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-policy-cache
2018-12-10 15:36:18 +08:00
Qiu Jian
da1efdaabf
增加policy缓存，降低日志量和计算量
2018-12-10 15:35:15 +08:00
Qiu Jian
965e84ea36
update
2018-12-07 02:57:58 +08:00
Yousong Zhou
3386c0f59e
appsrv: workers: 移除调试用日志
2018-12-03 13:44:46 +00: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
邱剑
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
Qiu Jian
7d80c3f250
Change workermanager backlog to 1024
2018-11-23 01:53:29 +08:00
wanyaoqi
e64b71818b
region: support create backup guest;
...
scheduler: support backup guest schedule
2018-11-20 21:29:43 +08:00
Qiu Jian
77ed2af387
minor fixes
2018-11-09 12:28:18 +08:00
Qiu Jian
caf0e3c36f
修正：1. panic后不返回500 2. 超时还会阻塞worker
2018-11-09 11:17:14 +08:00
邱剑
5be11457af
Automatic merge from release/2.2.0 -> release/2.3.0
...
* commit 'bdf329c091f61a6cfa245c3344584272ad808cbc':
改进：允许每个handler有独立的processTimeout和workermanager，用于上传等特殊的场景
2018-10-27 11:22:14 +08:00
Qiu Jian
20211ac972
改进：允许每个handler有独立的processTimeout和workermanager，用于上传等特殊的场景
2018-10-26 17:29:58 +08:00
Zexi Li
aad9d13cca
reuse appsrv.FetchEnv method
2018-10-25 12:14:37 +08:00
Qiu Jian
fc61a8f9c5
add max_worker state
2018-10-22 10:02:40 +08:00
Qiu Jian
9cbd8891a9
增加：workerManager统计数据获取API
2018-10-22 09:53:50 +08:00
Qiu Jian
2d7e575e6f
minor fixes
2018-10-22 01:43:31 +08:00
Qiu Jian
4d1d4e56fd
修正：worker timeout之后需要从worker
...
manager中移除，不再占用worker的数量限额，否则timeout之后，并不能解决整个服务被卡住的问题
2018-10-22 01:38:52 +08:00
Qiu Jian
0dbc93725d
修正：利用context.Timeout，appsrv支持processTimeout，避免yunionapi由于后端卡住导致yunionapi卡住
2018-10-20 22:32:43 +08:00
Qiu Jian
575ea95525
改进：允许climc指定tls证书，允许服务指定tls证书
2018-10-17 16:45:11 +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
邱剑