From fcc56479ba6afb3e6b53c0c10cd41eff8f54a420 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Fri, 13 Oct 2017 20:25:45 +0000 Subject: [PATCH] Modify traces in deletion handler Kubernetes-commit: c4ca2c734963afd442ff6c43631d004092ea74e8 --- pkg/endpoints/handlers/rest.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/endpoints/handlers/rest.go b/pkg/endpoints/handlers/rest.go index e4f8565f6..7b1aa2d60 100644 --- a/pkg/endpoints/handlers/rest.go +++ b/pkg/endpoints/handlers/rest.go @@ -987,10 +987,11 @@ func DeleteResource(r rest.GracefulDeleter, allowsOptions bool, scope RequestSco scope.err(fmt.Errorf("decoded object cannot be converted to DeleteOptions"), w, req) return } + trace.Step("Decoded delete options") - trace.Step("About to record audit event") ae := request.AuditEventFrom(ctx) audit.LogRequestObject(ae, obj, scope.Resource, scope.Subresource, scope.Serializer) + trace.Step("Recorded the audit event") } else { if values := req.URL.Query(); len(values) > 0 { if err := metainternalversion.ParameterCodec.DecodeParameters(values, scope.MetaGroupVersion, options); err != nil { @@ -1002,8 +1003,8 @@ func DeleteResource(r rest.GracefulDeleter, allowsOptions bool, scope RequestSco } } + trace.Step("About to check admission control") if admit != nil && admit.Handles(admission.Delete) { - trace.Step("About to check admission control") userInfo, _ := request.UserFrom(ctx) err = admit.Admit(admission.NewAttributesRecord(nil, nil, scope.Kind, namespace, name, scope.Resource, scope.Subresource, admission.Delete, userInfo))