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

feat: [CDE-350]: Adding columns for active time start and end in gitspace table. (#2744)

Browse Source 
* feat: [CDE-350]: Adding columns for active time start and end in gitspace table.
This commit is contained in:
Dhruv Dhruv 2024-09-26 10:35:42 +00:00 committed by Harness
parent 05b4a99061
commit efcfd92517
9 changed files with 126 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/api/controller/gitspace/action.go
View File

@ -94,7 +94,7 @@ func (c *Controller) Action(
return gitspaceConfig, err return gitspaceConfig, err
case enum.GitspaceActionTypeStop: case enum.GitspaceActionTypeStop:
c.emitGitspaceConfigEvent(ctx, gitspaceConfig, enum.GitspaceEventTypeGitspaceActionStop) c.emitGitspaceConfigEvent(ctx, gitspaceConfig, enum.GitspaceEventTypeGitspaceActionStop)
err = c.stopGitspaceAction(ctx, gitspaceConfig) err = c.stopGitspaceAction(ctx, gitspaceConfig, time.Now())
return gitspaceConfig, err return gitspaceConfig, err
default: default:
return nil, fmt.Errorf("unknown action %s on gitspace : %s", string(in.Action), gitspaceConfig.Identifier) return nil, fmt.Errorf("unknown action %s on gitspace : %s", string(in.Action), gitspaceConfig.Identifier)
@ -265,6 +265,7 @@ func (c *Controller) gitspaceBusyOperation(
func (c *Controller) stopGitspaceAction( func (c *Controller) stopGitspaceAction(
ctx context.Context, ctx context.Context,
config *types.GitspaceConfig, config *types.GitspaceConfig,
now time.Time,
) error { ) error {
savedGitspaceInstance, err := c.gitspaceInstanceStore.FindLatestByGitspaceConfigID(ctx, config.ID) savedGitspaceInstance, err := c.gitspaceInstanceStore.FindLatestByGitspaceConfigID(ctx, config.ID)
if err != nil { if err != nil {
@ -279,6 +280,11 @@ func (c *Controller) stopGitspaceAction(
if err != nil { if err != nil {
return err return err
} }
activeTimeEnded := now.UnixMilli()
config.GitspaceInstance.ActiveTimeEnded = &activeTimeEnded
config.GitspaceInstance.TotalTimeUsed =
*(config.GitspaceInstance.ActiveTimeEnded) - *(config.GitspaceInstance.ActiveTimeStarted)
config.GitspaceInstance.State = enum.GitspaceInstanceStateStopping config.GitspaceInstance.State = enum.GitspaceInstanceStateStopping
if err = c.gitspaceSvc.UpdateInstance(ctx, config.GitspaceInstance); err != nil { if err = c.gitspaceSvc.UpdateInstance(ctx, config.GitspaceInstance); err != nil {
return fmt.Errorf("failed to update gitspace config for stopping %s %w", config.Identifier, err) return fmt.Errorf("failed to update gitspace config for stopping %s %w", config.Identifier, err)

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

@ -17,6 +17,7 @@ package gitspace
import ( import (
"context" "context"
"fmt" "fmt"
"time"
apiauth "github.com/harness/gitness/app/api/auth" apiauth "github.com/harness/gitness/app/api/auth"
"github.com/harness/gitness/app/auth" "github.com/harness/gitness/app/auth"
@ -65,6 +66,10 @@ func (c *Controller) Delete(
} }
func (c *Controller) stopRunningGitspace(ctx context.Context, config types.GitspaceConfig) { func (c *Controller) stopRunningGitspace(ctx context.Context, config types.GitspaceConfig) {
activeTimeEnded := time.Now().UnixMilli()
config.GitspaceInstance.ActiveTimeEnded = &activeTimeEnded
config.GitspaceInstance.TotalTimeUsed =
*(config.GitspaceInstance.ActiveTimeEnded) - *(config.GitspaceInstance.ActiveTimeStarted)
config.GitspaceInstance.State = enum.GitspaceInstanceStateStopping config.GitspaceInstance.State = enum.GitspaceInstanceStateStopping
err := c.gitspaceSvc.UpdateInstance(ctx, config.GitspaceInstance) err := c.gitspaceSvc.UpdateInstance(ctx, config.GitspaceInstance)
if err != nil { if err != nil {

5
app/gitspace/orchestrator/orchestrator_impl.go
View File

@ -400,8 +400,9 @@ func (o orchestrator) ResumeStartGitspace(
ideURLString := ideURL.String() ideURLString := ideURL.String()
gitspaceInstance.URL = &ideURLString gitspaceInstance.URL = &ideURLString
lastUsed := time.Now().UnixMilli() now := time.Now().UnixMilli()
gitspaceInstance.LastUsed = &lastUsed gitspaceInstance.LastUsed = &now
gitspaceInstance.ActiveTimeStarted = &now
gitspaceInstance.State = enum.GitspaceInstanceStateRunning gitspaceInstance.State = enum.GitspaceInstanceStateRunning
o.emitGitspaceEvent(ctx, gitspaceConfig, enum.GitspaceEventTypeGitspaceActionStartCompleted) o.emitGitspaceEvent(ctx, gitspaceConfig, enum.GitspaceEventTypeGitspaceActionStartCompleted)

73
app/store/database/gitspace_instance.go
View File

@ -50,7 +50,9 @@ const (
gits_machine_user, gits_machine_user,
gits_uid, gits_uid,
gits_access_key_ref, gits_access_key_ref,
gits_last_heartbeat` gits_last_heartbeat,
gits_active_time_started,
gits_active_time_ended`
gitspaceInstanceSelectColumns = "gits_id," + gitspaceInstanceInsertColumns gitspaceInstanceSelectColumns = "gits_id," + gitspaceInstanceInsertColumns
gitspaceInstanceTable = `gitspaces` gitspaceInstanceTable = `gitspaces`
) )
@ -61,19 +63,21 @@ type gitspaceInstance struct {
URL null.String `db:"gits_url"` URL null.String `db:"gits_url"`
State enum.GitspaceInstanceStateType `db:"gits_state"` State enum.GitspaceInstanceStateType `db:"gits_state"`
// TODO: migrate to principal int64 id to use principal cache and consistent with Harness code. // TODO: migrate to principal int64 id to use principal cache and consistent with Harness code.
UserUID string `db:"gits_user_uid"` UserUID string `db:"gits_user_uid"`
ResourceUsage null.String `db:"gits_resource_usage"` ResourceUsage null.String `db:"gits_resource_usage"`
SpaceID int64 `db:"gits_space_id"` SpaceID int64 `db:"gits_space_id"`
LastUsed null.Int `db:"gits_last_used"` LastUsed null.Int `db:"gits_last_used"`
TotalTimeUsed int64 `db:"gits_total_time_used"` TotalTimeUsed int64 `db:"gits_total_time_used"`
TrackedChanges null.String `db:"gits_tracked_changes"` TrackedChanges null.String `db:"gits_tracked_changes"`
AccessType enum.GitspaceAccessType `db:"gits_access_type"` AccessType enum.GitspaceAccessType `db:"gits_access_type"`
AccessKeyRef null.String `db:"gits_access_key_ref"` AccessKeyRef null.String `db:"gits_access_key_ref"`
MachineUser null.String `db:"gits_machine_user"` MachineUser null.String `db:"gits_machine_user"`
Identifier string `db:"gits_uid"` Identifier string `db:"gits_uid"`
Created int64 `db:"gits_created"` Created int64 `db:"gits_created"`
Updated int64 `db:"gits_updated"` Updated int64 `db:"gits_updated"`
LastHeartbeat null.Int `db:"gits_last_heartbeat"` LastHeartbeat null.Int `db:"gits_last_heartbeat"`
ActiveTimeStarted null.Int `db:"gits_active_time_started"`
ActiveTimeEnded null.Int `db:"gits_active_time_ended"`
} }
// NewGitspaceInstanceStore returns a new GitspaceInstanceStore. // NewGitspaceInstanceStore returns a new GitspaceInstanceStore.
@ -147,6 +151,8 @@ func (g gitspaceInstanceStore) Create(ctx context.Context, gitspaceInstance *typ
gitspaceInstance.Identifier, gitspaceInstance.Identifier,
gitspaceInstance.AccessKeyRef, gitspaceInstance.AccessKeyRef,
gitspaceInstance.LastHeartbeat, gitspaceInstance.LastHeartbeat,
gitspaceInstance.ActiveTimeStarted,
gitspaceInstance.ActiveTimeEnded,
). ).
Suffix(ReturningClause + "gits_id") Suffix(ReturningClause + "gits_id")
sql, args, err := stmt.ToSql() sql, args, err := stmt.ToSql()
@ -171,6 +177,9 @@ func (g gitspaceInstanceStore) Update(
Set("gits_last_used", gitspaceInstance.LastUsed). Set("gits_last_used", gitspaceInstance.LastUsed).
Set("gits_last_heartbeat", gitspaceInstance.LastHeartbeat). Set("gits_last_heartbeat", gitspaceInstance.LastHeartbeat).
Set("gits_url", gitspaceInstance.URL). Set("gits_url", gitspaceInstance.URL).
Set("gits_active_time_started", gitspaceInstance.ActiveTimeStarted).
Set("gits_active_time_ended", gitspaceInstance.ActiveTimeEnded).
Set("gits_total_time_used", gitspaceInstance.TotalTimeUsed).
Set("gits_updated", gitspaceInstance.Updated). Set("gits_updated", gitspaceInstance.Updated).
Where("gits_id = ?", gitspaceInstance.ID) Where("gits_id = ?", gitspaceInstance.ID)
sql, args, err := stmt.ToSql() sql, args, err := stmt.ToSql()
@ -269,23 +278,25 @@ func (g gitspaceInstanceStore) mapToGitspaceInstance(
in *gitspaceInstance, in *gitspaceInstance,
) (*types.GitspaceInstance, error) { ) (*types.GitspaceInstance, error) {
var res = &types.GitspaceInstance{ var res = &types.GitspaceInstance{
ID: in.ID, ID: in.ID,
Identifier: in.Identifier, Identifier: in.Identifier,
GitSpaceConfigID: in.GitSpaceConfigID, GitSpaceConfigID: in.GitSpaceConfigID,
URL: in.URL.Ptr(), URL: in.URL.Ptr(),
State: in.State, State: in.State,
UserID: in.UserUID, UserID: in.UserUID,
ResourceUsage: in.ResourceUsage.Ptr(), ResourceUsage: in.ResourceUsage.Ptr(),
LastUsed: in.LastUsed.Ptr(), LastUsed: in.LastUsed.Ptr(),
TotalTimeUsed: in.TotalTimeUsed, TotalTimeUsed: in.TotalTimeUsed,
TrackedChanges: in.TrackedChanges.Ptr(), TrackedChanges: in.TrackedChanges.Ptr(),
AccessType: in.AccessType, AccessType: in.AccessType,
AccessKeyRef: in.AccessKeyRef.Ptr(), AccessKeyRef: in.AccessKeyRef.Ptr(),
MachineUser: in.MachineUser.Ptr(), MachineUser: in.MachineUser.Ptr(),
SpaceID: in.SpaceID, SpaceID: in.SpaceID,
Created: in.Created, Created: in.Created,
Updated: in.Updated, Updated: in.Updated,
LastHeartbeat: in.LastHeartbeat.Ptr(), LastHeartbeat: in.LastHeartbeat.Ptr(),
ActiveTimeEnded: in.ActiveTimeEnded.Ptr(),
ActiveTimeStarted: in.ActiveTimeStarted.Ptr(),
} }
return res, nil return res, nil
} }

3
app/store/database/migrate/postgres/0078_alter_gitspaces_add_active_time.down.sql Normal file
View File

@ -0,0 +1,3 @@
ALTER TABLE gitspaces DROP COLUMN gits_active_time_started;
ALTER TABLE gitspaces DROP COLUMN gits_active_time_ended;
UPDATE gitspaces SET gits_total_time_used = 0;

21
app/store/database/migrate/postgres/0078_alter_gitspaces_add_active_time.up.sql Normal file
View File

@ -0,0 +1,21 @@
ALTER TABLE gitspaces ADD COLUMN gits_active_time_started BIGINT;
ALTER TABLE gitspaces ADD COLUMN gits_active_time_ended BIGINT;
UPDATE gitspaces
SET gits_active_time_started =
CASE
WHEN gits_state = 'uninitialized' THEN NULL
ELSE gits_created
END;
UPDATE gitspaces
SET gits_active_time_ended =
CASE
WHEN gits_state IN ('running', 'starting', 'uninitialized') THEN NULL
ELSE gits_updated
END;
UPDATE gitspaces
SET gits_total_time_used = gits_active_time_ended - gits_active_time_started
WHERE gits_active_time_ended IS NOT NULL
AND gits_active_time_started IS NOT NULL;

3
app/store/database/migrate/sqlite/0078_alter_gitspaces_add_active_time.down.sql Normal file
View File

@ -0,0 +1,3 @@
ALTER TABLE gitspaces DROP COLUMN gits_active_time_started;
ALTER TABLE gitspaces DROP COLUMN gits_active_time_ended;
UPDATE gitspaces SET gits_total_time_used = 0;

21
app/store/database/migrate/sqlite/0078_alter_gitspaces_add_active_time.up.sql Normal file
View File

@ -0,0 +1,21 @@
ALTER TABLE gitspaces ADD COLUMN gits_active_time_started BIGINT;
ALTER TABLE gitspaces ADD COLUMN gits_active_time_ended BIGINT;
UPDATE gitspaces
SET gits_active_time_started =
CASE
WHEN gits_state = 'uninitialized' THEN NULL
ELSE gits_created
END;
UPDATE gitspaces
SET gits_active_time_ended =
CASE
WHEN gits_state IN ('running', 'starting', 'uninitialized') THEN NULL
ELSE gits_updated
END;
UPDATE gitspaces
SET gits_total_time_used = gits_active_time_ended - gits_active_time_started
WHERE gits_active_time_ended IS NOT NULL
AND gits_active_time_started IS NOT NULL;

40
types/gitspace.go
View File

@ -55,25 +55,27 @@ type GitspaceUser struct {
} }
type GitspaceInstance struct { type GitspaceInstance struct {
ID int64 `json:"-"` ID int64 `json:"-"`
GitSpaceConfigID int64 `json:"-"` GitSpaceConfigID int64 `json:"-"`
Identifier string `json:"identifier"` Identifier string `json:"identifier"`
URL *string `json:"url,omitempty"` URL *string `json:"url,omitempty"`
State enum.GitspaceInstanceStateType `json:"state"` State enum.GitspaceInstanceStateType `json:"state"`
UserID string `json:"-"` UserID string `json:"-"`
ResourceUsage *string `json:"resource_usage"` ResourceUsage *string `json:"resource_usage"`
LastUsed *int64 `json:"last_used,omitempty"` LastUsed *int64 `json:"last_used,omitempty"`
TotalTimeUsed int64 `json:"total_time_used"` TotalTimeUsed int64 `json:"total_time_used"`
TrackedChanges *string `json:"tracked_changes"` TrackedChanges *string `json:"tracked_changes"`
AccessKey *string `json:"access_key,omitempty"` AccessKey *string `json:"access_key,omitempty"`
AccessType enum.GitspaceAccessType `json:"access_type"` AccessType enum.GitspaceAccessType `json:"access_type"`
AccessKeyRef *string `json:"access_key_ref"` AccessKeyRef *string `json:"access_key_ref"`
MachineUser *string `json:"machine_user,omitempty"` MachineUser *string `json:"machine_user,omitempty"`
SpacePath string `json:"space_path"` SpacePath string `json:"space_path"`
SpaceID int64 `json:"-"` SpaceID int64 `json:"-"`
Created int64 `json:"created"` Created int64 `json:"created"`
Updated int64 `json:"updated"` Updated int64 `json:"updated"`
LastHeartbeat *int64 `json:"last_heartbeat,omitempty"` LastHeartbeat *int64 `json:"last_heartbeat,omitempty"`
ActiveTimeStarted *int64 `json:"active_time_started,omitempty"`
ActiveTimeEnded *int64 `json:"active_time_ended,omitempty"`
} }
type GitspaceFilter struct { type GitspaceFilter struct {