github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #26880 from wojtek-t/better_traces 

Automatic merge from submit-queue

Fix traces

Ref #26185
pull/6/head
k8s-merge-robot 2016-06-08 08:06:18 -07:00
parent e7fa88f6bc 394db3b407
commit e7102b4fd9
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/storage/etcd/etcd_helper.go
View File

@ -136,8 +136,8 @@ func (h *etcdHelper) Create(ctx context.Context, key string, obj, out runtime.Ob
PrevExist: etcd.PrevNoExist,
}
response, err := h.etcdKeysAPI.Set(ctx, key, string(data), &opts)
metrics.RecordEtcdRequestLatency("create", getTypeName(obj), startTime)
trace.Step("Object created")
metrics.RecordEtcdRequestLatency("create", getTypeName(obj), startTime)
if err != nil {
return toStorageErr(err, key, 0)
}
@ -335,9 +335,8 @@ func (h *etcdHelper) GetToList(ctx context.Context, key string, filter storage.F
Quorum: h.quorum,
}
response, err := h.etcdKeysAPI.Get(ctx, key, opts)
metrics.RecordEtcdRequestLatency("get", getTypeName(listPtr), startTime)
trace.Step("Etcd node read")
metrics.RecordEtcdRequestLatency("get", getTypeName(listPtr), startTime)
if err != nil {
if etcdutil.IsEtcdNotFound(err) {
return nil
@ -415,8 +414,8 @@ func (h *etcdHelper) List(ctx context.Context, key string, resourceVersion strin
startTime := time.Now()
trace.Step("About to list etcd node")
nodes, index, err := h.listEtcdNode(ctx, key)
metrics.RecordEtcdRequestLatency("list", getTypeName(listPtr), startTime)
trace.Step("Etcd node listed")
metrics.RecordEtcdRequestLatency("list", getTypeName(listPtr), startTime)
if err != nil {
return err
}