From 720cb73550299e02cff866c210bcd5dce42beee8 Mon Sep 17 00:00:00 2001 From: "xu.zhu" Date: Thu, 30 Mar 2023 11:59:06 +0800 Subject: [PATCH 1/2] fix: add some logs for troubleshooting of missing buildLog Signed-off-by: xu.zhu --- core/controller/cloudevent/controller.go | 7 +++++++ pkg/cluster/tekton/collector/collector_s3.go | 12 ++++++++++++ 2 files changed, 19 insertions(+) diff --git a/core/controller/cloudevent/controller.go b/core/controller/cloudevent/controller.go index d293a959..5b4b95fb 100644 --- a/core/controller/cloudevent/controller.go +++ b/core/controller/cloudevent/controller.go @@ -61,6 +61,9 @@ func (c *controller) CloudEvent(ctx context.Context, wpr *WrappedPipelineRun) (e if err != nil { return err } + // TODO(zhuxu): logs for troubleshooting of missing buildLog + log.Infof(ctx, "got cloudEvent of pipelineRun %v, event id: %v", + horizonMetaData.PipelinerunID, horizonMetaData.EventID) environment := horizonMetaData.Environment pipelinerunID := horizonMetaData.PipelinerunID @@ -80,6 +83,10 @@ func (c *controller) CloudEvent(ctx context.Context, wpr *WrappedPipelineRun) (e return err } + // TODO(zhuxu): logs for troubleshooting of missing buildLog + log.Infof(ctx, "pipelineRun %v status: %v, started at %v, finished at %v", + pipelinerunID, result.Result, result.StartTime, result.CompletionTime) + // 2. update pipelinerun in db if err := c.pipelinerunMgr.UpdateResultByID(ctx, pipelinerunID, &prmodels.Result{ S3Bucket: result.Bucket, diff --git a/pkg/cluster/tekton/collector/collector_s3.go b/pkg/cluster/tekton/collector/collector_s3.go index 7d4b833b..2041c437 100644 --- a/pkg/cluster/tekton/collector/collector_s3.go +++ b/pkg/cluster/tekton/collector/collector_s3.go @@ -126,11 +126,19 @@ func (c *S3Collector) Collect(ctx context.Context, pr *v1beta1.PipelineRun, hori if err != nil { return nil, err } + + // TODO(zhuxu): logs for troubleshooting of missing buildLog + logutil.Infof(ctx, "collected log result: logObject: %s, logURL: %s", + collectLogResult.LogObject, collectLogResult.LogURL) + collectObjectResult, err := c.collectObject(ctx, metadata, pr) if err != nil { return nil, err } + // TODO(zhuxu): logs for troubleshooting of missing buildLog + logutil.Infof(ctx, "collected object result: %+v", collectObjectResult) + logStruct := NewLogStruct(collectObjectResult.PrURL, metadata, collectLogResult.LogURL, collectLogResult.LogContent) b, err := json.Marshal(logStruct) @@ -158,6 +166,10 @@ func (c *S3Collector) Collect(ctx context.Context, pr *v1beta1.PipelineRun, hori } return nil, err } + + // TODO(zhuxu): logs for troubleshooting of missing buildLog + logutil.Infof(ctx, "tekton pipelineRun is deleted successfully, ID: %v", horizonMetaData.PipelinerunID) + return collectResult, nil } From 2fae98f6e02e8d6776b8e27abc977983759fd1e0 Mon Sep 17 00:00:00 2001 From: "xu.zhu" Date: Mon, 3 Apr 2023 16:24:35 +0800 Subject: [PATCH 2/2] fix: review comments Signed-off-by: xu.zhu --- core/controller/cloudevent/controller.go | 6 ++---- pkg/cluster/tekton/collector/collector_s3.go | 9 +++------ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/core/controller/cloudevent/controller.go b/core/controller/cloudevent/controller.go index 5b4b95fb..7e0d3c70 100644 --- a/core/controller/cloudevent/controller.go +++ b/core/controller/cloudevent/controller.go @@ -61,8 +61,7 @@ func (c *controller) CloudEvent(ctx context.Context, wpr *WrappedPipelineRun) (e if err != nil { return err } - // TODO(zhuxu): logs for troubleshooting of missing buildLog - log.Infof(ctx, "got cloudEvent of pipelineRun %v, event id: %v", + log.Debugf(ctx, "got cloudEvent of pipelineRun %v, event id: %v", horizonMetaData.PipelinerunID, horizonMetaData.EventID) environment := horizonMetaData.Environment @@ -83,8 +82,7 @@ func (c *controller) CloudEvent(ctx context.Context, wpr *WrappedPipelineRun) (e return err } - // TODO(zhuxu): logs for troubleshooting of missing buildLog - log.Infof(ctx, "pipelineRun %v status: %v, started at %v, finished at %v", + log.Debugf(ctx, "pipelineRun %v status: %v, started at %v, finished at %v", pipelinerunID, result.Result, result.StartTime, result.CompletionTime) // 2. update pipelinerun in db diff --git a/pkg/cluster/tekton/collector/collector_s3.go b/pkg/cluster/tekton/collector/collector_s3.go index 2041c437..8f8ecfcf 100644 --- a/pkg/cluster/tekton/collector/collector_s3.go +++ b/pkg/cluster/tekton/collector/collector_s3.go @@ -127,8 +127,7 @@ func (c *S3Collector) Collect(ctx context.Context, pr *v1beta1.PipelineRun, hori return nil, err } - // TODO(zhuxu): logs for troubleshooting of missing buildLog - logutil.Infof(ctx, "collected log result: logObject: %s, logURL: %s", + logutil.Debugf(ctx, "collected log result: logObject: %s, logURL: %s", collectLogResult.LogObject, collectLogResult.LogURL) collectObjectResult, err := c.collectObject(ctx, metadata, pr) @@ -136,8 +135,7 @@ func (c *S3Collector) Collect(ctx context.Context, pr *v1beta1.PipelineRun, hori return nil, err } - // TODO(zhuxu): logs for troubleshooting of missing buildLog - logutil.Infof(ctx, "collected object result: %+v", collectObjectResult) + logutil.Debugf(ctx, "collected object result: %+v", collectObjectResult) logStruct := NewLogStruct(collectObjectResult.PrURL, metadata, collectLogResult.LogURL, collectLogResult.LogContent) @@ -167,8 +165,7 @@ func (c *S3Collector) Collect(ctx context.Context, pr *v1beta1.PipelineRun, hori return nil, err } - // TODO(zhuxu): logs for troubleshooting of missing buildLog - logutil.Infof(ctx, "tekton pipelineRun is deleted successfully, ID: %v", horizonMetaData.PipelinerunID) + logutil.Debugf(ctx, "tekton pipelineRun is deleted successfully, ID: %v", horizonMetaData.PipelinerunID) return collectResult, nil }