github/drone
5
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-19 02:20:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: [CDE-483]: modify remove gitspace func (#2989)

Browse Source 
* add debug log
* capture error
* modify remove gitspace func
This commit is contained in:
Deepak Bhatt 2024-11-13 09:11:26 +00:00 committed by Harness
parent 94ec638b7b
commit 622f6d232c
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/api/controller/gitspace/delete.go
View File

@ -69,6 +69,11 @@ func (c *Controller) Delete(
} }
ctxWithoutCancel := context.WithoutCancel(ctx) ctxWithoutCancel := context.WithoutCancel(ctx)
go c.gitspaceSvc.RemoveGitspace(ctxWithoutCancel, *gitspaceConfig, true) go func() {
err2 := c.gitspaceSvc.RemoveGitspace(ctxWithoutCancel, *gitspaceConfig, true)
if err2 != nil {
log.Debug().Err(err2).Msgf("unable to Delete gitspace: " + identifier)
}
}()
return nil return nil
} }

19
app/services/gitspace/action_delete.go
View File

@ -16,6 +16,7 @@ package gitspace
import ( import (
"context" "context"
"fmt"
"time" "time"
"github.com/harness/gitness/types" "github.com/harness/gitness/types"
@ -27,13 +28,13 @@ import (
// gitspaceInstanceCleaningTimedOutMins is timeout for which a gitspace instance can be in cleaning state. // gitspaceInstanceCleaningTimedOutMins is timeout for which a gitspace instance can be in cleaning state.
const gitspaceInstanceCleaningTimedOutMins = 15 const gitspaceInstanceCleaningTimedOutMins = 15
func (c *Service) RemoveGitspace(ctx context.Context, config types.GitspaceConfig, canDeleteUserData bool) { func (c *Service) RemoveGitspace(ctx context.Context, config types.GitspaceConfig, canDeleteUserData bool) error {
if config.GitspaceInstance.State == enum.GitSpaceInstanceStateCleaning && if config.GitspaceInstance.State == enum.GitSpaceInstanceStateCleaning &&
time.Since(time.UnixMilli(config.GitspaceInstance.Updated)).Milliseconds() <= time.Since(time.UnixMilli(config.GitspaceInstance.Updated)).Milliseconds() <=
(gitspaceInstanceCleaningTimedOutMins*60*1000) { (gitspaceInstanceCleaningTimedOutMins*60*1000) {
log.Ctx(ctx).Warn().Msgf("gitspace start/stop is already pending for : %q", log.Ctx(ctx).Warn().Msgf("gitspace start/stop is already pending for : %q",
config.GitspaceInstance.Identifier) config.GitspaceInstance.Identifier)
return return fmt.Errorf("gitspace is already pending for : %q", config.GitspaceInstance.Identifier)
} }
if config.GitspaceInstance.State == enum.GitspaceInstanceStateRunning { if config.GitspaceInstance.State == enum.GitspaceInstanceStateRunning {
@ -50,7 +51,10 @@ func (c *Service) RemoveGitspace(ctx context.Context, config types.GitspaceConfi
if err != nil { if err != nil {
log.Ctx(ctx).Err(err).Msgf("failed to update instance %s before triggering delete", log.Ctx(ctx).Err(err).Msgf("failed to update instance %s before triggering delete",
config.GitspaceInstance.Identifier) config.GitspaceInstance.Identifier)
return return fmt.Errorf("failed to update instance %s before triggering delete: %w",
config.GitspaceInstance.Identifier,
err,
)
} }
if err := c.TriggerDelete(ctx, config, canDeleteUserData); err != nil { if err := c.TriggerDelete(ctx, config, canDeleteUserData); err != nil {
@ -61,10 +65,17 @@ func (c *Service) RemoveGitspace(ctx context.Context, config types.GitspaceConfi
log.Ctx(ctx).Err(updateErr).Msgf("failed to update instance %s after error in triggering delete", log.Ctx(ctx).Err(updateErr).Msgf("failed to update instance %s after error in triggering delete",
config.GitspaceInstance.Identifier) config.GitspaceInstance.Identifier)
} }
return
return fmt.Errorf("failed to trigger delete for gitspace instance %s: %w",
config.GitspaceInstance.Identifier,
err,
)
} }
log.Ctx(ctx).Debug().Msgf("successfully triggered delete for gitspace instance %s", log.Ctx(ctx).Debug().Msgf("successfully triggered delete for gitspace instance %s",
config.GitspaceInstance.Identifier) config.GitspaceInstance.Identifier)
return nil
} }
func (c *Service) TriggerDelete( func (c *Service) TriggerDelete(