Skip to content

Commit 9a34645

Browse files
tiny-xtiny-x
committed
fix: k8s jvm exec
Signed-off-by: tiny-x <xf.yefei@gmail.com> fix: k8s jvm exec Signed-off-by: tiny-x <xf.yefei@gmail.com>
1 parent 34b7878 commit 9a34645

File tree

5 files changed

+23
-25
lines changed

5 files changed

+23
-25
lines changed

‎cli/cmd/create.go

+11-14
Original file line numberDiff line numberDiff line change
@@ -196,27 +196,24 @@ func (cc *CreateCommand) actionRunEFunc(target, scope string, actionCommand *act
196196
endpointCallBack(ctx, endpoint, model.Uid, response)
197197
return response
198198
}
199-
if expModel.ActionProcessHang {
199+
200+
if expModel.ActionProcessHang && scope != "pod" && scope != "container" {
200201
// todo -> need to find a better way to query the status
201202
time.Sleep(time.Millisecond * 100)
202203
log.Debugf(ctx, "result: %v", response.Result)
203-
if !response.Success {
204-
checkError(GetDS().UpdateExperimentModelByUid(model.Uid, Error, response.Err))
204+
if response.Result == nil {
205+
errMsg := fmt.Sprintf("chaos_os process not found, please check chaosblade log")
206+
checkError(GetDS().UpdateExperimentModelByUid(model.Uid, Error, errMsg))
207+
response.Err = errMsg
205208
} else {
206-
if response.Result == nil {
207-
errMsg := fmt.Sprintf("chaos_os process not found, please check chaosblade log")
209+
_, err := process.NewProcess(int32(response.Result.(int)))
210+
if err != nil {
211+
errMsg := fmt.Sprintf("chaos_os process not found, please check chaosblade log, err: %s", err.Error())
208212
checkError(GetDS().UpdateExperimentModelByUid(model.Uid, Error, errMsg))
209213
response.Err = errMsg
210214
} else {
211-
_, err := process.NewProcess(int32(response.Result.(int)))
212-
if err != nil {
213-
errMsg := fmt.Sprintf("chaos_os process not found, please check chaosblade log, err: %s", err.Error())
214-
checkError(GetDS().UpdateExperimentModelByUid(model.Uid, Error, errMsg))
215-
response.Err = errMsg
216-
} else {
217-
// update status
218-
checkError(GetDS().UpdateExperimentModelByUid(model.Uid, Success, response.Err))
219-
}
215+
// update status
216+
checkError(GetDS().UpdateExperimentModelByUid(model.Uid, Success, response.Err))
220217
}
221218
}
222219
} else {

‎cli/cmd/exp.go

+1
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ func (ec *baseExpCommandService) registerDockerExpCommands() []*modelCommand {
200200
for idx := range models.Models {
201201
model := &models.Models[idx]
202202
model.ExpScope = "docker"
203+
spec.AddFlagsToModelSpec(exec.GetExecInContainerFlags, model)
203204
command := ec.registerExpCommand(model, dockerSpec.Name())
204205
modelCommands = append(modelCommands, command)
205206
}

‎exec/kubernetes/executor.go

+3
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,9 @@ func (e *Executor) Exec(uid string, ctx context.Context, expModel *spec.ExpModel
144144
operation = QueryDestroy
145145
response, completed = e.destroy(ctx, client, config)
146146
} else {
147+
if expModel.ActionProcessHang {
148+
expModel.ActionFlags["cgroup-root"] = "/host-sys/fs/cgroup"
149+
}
147150
operation = QueryCreate
148151
response, completed = e.create(ctx, client, config, uid, expModel)
149152
}

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ module github.com/chaosblade-io/chaosblade
33
go 1.13
44

55
require (
6-
github.com/chaosblade-io/chaosblade-exec-cri v1.5.1-0.20220426025737-30c292fe50f2
6+
github.com/chaosblade-io/chaosblade-exec-cri v1.5.1-0.20220429064319-1baacd4efc7e
77
github.com/chaosblade-io/chaosblade-exec-os v1.5.1-0.20220426025253-6d1640d20ae4
8-
github.com/chaosblade-io/chaosblade-operator v1.5.1-0.20220426064640-09bb2d6b05f7
8+
github.com/chaosblade-io/chaosblade-operator v1.5.1-0.20220429080716-d91b82573cbc
99
github.com/chaosblade-io/chaosblade-spec-go v1.5.1-0.20220423030509-6d8dbd90b300
1010
github.com/mattn/go-sqlite3 v1.10.1-0.20190217174029-ad30583d8387
1111
github.com/olekukonko/tablewriter v0.0.5-0.20201029120751-42e21c7531a3

‎go.sum

+6-9
Original file line numberDiff line numberDiff line change
@@ -164,17 +164,12 @@ github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tj
164164
github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
165165
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
166166
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
167-
github.com/chaosblade-io/chaosblade-exec-cri v1.5.1-0.20220414062646-d65e7db648f7/go.mod h1:kNBBoGpqErDNhF+SDGs8VCbg11sqe9FggfHQNjopco4=
168-
github.com/chaosblade-io/chaosblade-exec-cri v1.5.1-0.20220426025737-30c292fe50f2 h1:lXilvxpaUXTvHRLXCN544A8J3lOA793g3254YRA6yzs=
169-
github.com/chaosblade-io/chaosblade-exec-cri v1.5.1-0.20220426025737-30c292fe50f2/go.mod h1:ntY1QmFauHvQ6jIuAeJXjDoaNxuQxi6lmzodBsScZbc=
170-
github.com/chaosblade-io/chaosblade-exec-os v1.5.1-0.20220414062130-f930629babd8/go.mod h1:3XPEZl5qwaUOEL+pwuhiel9rMkXuxfKGjge1qL+FZrQ=
167+
github.com/chaosblade-io/chaosblade-exec-cri v1.5.1-0.20220429064319-1baacd4efc7e h1:ZF05b4HKrg3vKe6b0QI9UxtebZ3M8ZS3fNW/A7/z598=
168+
github.com/chaosblade-io/chaosblade-exec-cri v1.5.1-0.20220429064319-1baacd4efc7e/go.mod h1:ntY1QmFauHvQ6jIuAeJXjDoaNxuQxi6lmzodBsScZbc=
171169
github.com/chaosblade-io/chaosblade-exec-os v1.5.1-0.20220426025253-6d1640d20ae4 h1:L1S4syQy85xfC+Yb7S88DIkdYrRyJV1Rqq5GfBYwbKg=
172170
github.com/chaosblade-io/chaosblade-exec-os v1.5.1-0.20220426025253-6d1640d20ae4/go.mod h1:UNDuSGNygBqqGVxUMhCL56BwK/up53bz8qKVOdEEyFE=
173-
github.com/chaosblade-io/chaosblade-operator v1.5.1-0.20220414062903-5eaea8ce82f3 h1:mpFMEjjyV8/fG4oa87ac7irBYr7BQVYwW8TYfNe8gfI=
174-
github.com/chaosblade-io/chaosblade-operator v1.5.1-0.20220414062903-5eaea8ce82f3/go.mod h1:5y9PNF4v6m0j5jjZDIksxxDwpIX+xRkrlUhcZn2R3G0=
175-
github.com/chaosblade-io/chaosblade-operator v1.5.1-0.20220426064640-09bb2d6b05f7 h1:q511BtUgyPBZBlzilciFOyU8i4ygj5l2oxXdkziQbmE=
176-
github.com/chaosblade-io/chaosblade-operator v1.5.1-0.20220426064640-09bb2d6b05f7/go.mod h1:b5jwEuuADJDsgs6tb/MsvDcsGzVi95nQcsGzVvYTgvI=
177-
github.com/chaosblade-io/chaosblade-spec-go v1.5.1-0.20220403044331-978f0910eaf3/go.mod h1:977aR5J4BBfLtFkYZkbHv1i7NJYN1X0x85xO3b8YLpc=
171+
github.com/chaosblade-io/chaosblade-operator v1.5.1-0.20220429080716-d91b82573cbc h1:flvATfoh6jsf8vViEyIJkwmhJHfgJV6OzUdbY/Gm9e4=
172+
github.com/chaosblade-io/chaosblade-operator v1.5.1-0.20220429080716-d91b82573cbc/go.mod h1:oEXBsPLe6eYQV3/cctw9u2Skye7erXOx+OVJshtgR/0=
178173
github.com/chaosblade-io/chaosblade-spec-go v1.5.1-0.20220423030509-6d8dbd90b300 h1:zHZkTkuMHbeSOZ/vXYgo+0p/qFfLaXQdwKyAFh75hyA=
179174
github.com/chaosblade-io/chaosblade-spec-go v1.5.1-0.20220423030509-6d8dbd90b300/go.mod h1:977aR5J4BBfLtFkYZkbHv1i7NJYN1X0x85xO3b8YLpc=
180175
github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw=
@@ -371,6 +366,7 @@ github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD
371366
github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
372367
github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
373368
github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE=
369+
github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 h1:cenwrSVm+Z7QLSV/BsnenAOcDXdX4cMv4wP0B/5QbPg=
374370
github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
375371
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
376372
github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
@@ -385,6 +381,7 @@ github.com/elastic/go-sysinfo v1.1.1/go.mod h1:i1ZYdU10oLNfRzq4vq62BEwD2fH8KaWh6
385381
github.com/elastic/go-windows v1.0.0/go.mod h1:TsU0Nrp7/y3+VwE82FoZF8gC/XFg/Elz6CcloAxnPgU=
386382
github.com/elastic/go-windows v1.0.1/go.mod h1:FoVvqWSun28vaDQPbj2Elfc0JahhPB7WQEGa3c814Ss=
387383
github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
384+
github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 h1:yUdfgN0XgIJw7foRItutHYUIhlcKzcSf5vDpdhQAKTc=
388385
github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
389386
github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
390387
github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk=

0 commit comments

Comments
 (0)