fix: don't current timestamp in sidecat container name

steadybit · Nov 30, 2023 · dcce24a · dcce24a
1 parent 87198ac
commit dcce24a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 21 deletions.
diff --git a/pkg/diskfill/diskfill.go b/pkg/diskfill/diskfill.go
@@ -12,7 +12,6 @@ import (
 	"github.com/steadybit/extension-kit/extutil"
 	"strconv"
 	"sync"
-	"sync/atomic"
 	"syscall"
 	"time"
 )
@@ -21,22 +20,20 @@ type DiskFill struct {
 	startBundle runc.ContainerBundle
 	sizeBundle  runc.ContainerBundle
 	runc        runc.Runc
-	method 		string
-	ddCond   *sync.Cond
-	rmCond   *sync.Cond
-	ddExited bool
-	rmExited bool
-	err      error
-	args     []string
+	method      string
+	ddCond      *sync.Cond
+	rmCond      *sync.Cond
+	ddExited    bool
+	rmExited    bool
+	err         error
+	args        []string
 }
 
-const MaxBlockSize = 1024 //Megabytes (1GB)
+const MaxBlockSize = 1024  //Megabytes (1GB)
 const DefaultBlockSize = 5 //Megabytes (5MB)
 const cGroupChild = "disk-fill"
 const mountPoint = "/disk-fill-temp"
 
-var counter = atomic.Int32{}
-
 type Opts struct {
 	BlockSize int    // in megabytes
 	Size      int    // in megabytes or percentage
@@ -177,7 +174,7 @@ func resolveDiskSpace(ctx context.Context, r runc.Runc, config utils.TargetConta
 }
 
 func getNextContainerId(targetId string) string {
-	return fmt.Sprintf("sb-disk-fill-%d-%s", counter.Add(1), targetId[:8])
+	return fmt.Sprintf("sb-disk-fill-%d-%s", time.Now().Unix(), targetId[:8])
 }
 
 func (df *DiskFill) Exited() (bool, error) {

diff --git a/pkg/network/network.go b/pkg/network/network.go
@@ -17,13 +17,11 @@ import (
 	"github.com/steadybit/extension-kit/extutil"
 	"runtime/trace"
 	"strconv"
-	"sync/atomic"
+	"time"
 )
 
 var (
-	counter = atomic.Int32{}
-	runLock = utils.NewHashedKeyMutex(10)
-
+	runLock          = utils.NewHashedKeyMutex(10)
 	sidecarImagePath = utils.SidecarImagePath
 )
 
@@ -123,7 +121,7 @@ func getNextContainerId(targedId string) string {
 	if len(targedId) < l {
 		l = len(targedId)
 	}
-	return fmt.Sprintf("sb-network-%d-%s", counter.Add(1), targedId[:l])
+	return fmt.Sprintf("sb-network-%d-%s", time.Now().Unix(), targedId[:l])
 }
 
 func executeIpCommands(ctx context.Context, r runc.Runc, config utils.TargetContainerConfig, family networkutils.Family, cmds []string) error {

diff --git a/pkg/stress/stress.go b/pkg/stress/stress.go
@@ -12,7 +12,6 @@ import (
 	"github.com/steadybit/extension-container/pkg/utils"
 	"strconv"
 	"sync"
-	"sync/atomic"
 	"syscall"
 	"time"
 )
@@ -27,8 +26,6 @@ type Stress struct {
 	args   []string
 }
 
-var counter = atomic.Int32{}
-
 type Opts struct {
 	CpuWorkers *int
 	CpuLoad    int
@@ -124,7 +121,7 @@ func New(ctx context.Context, r runc.Runc, config utils.TargetContainerConfig, o
 }
 
 func getNextContainerId(targetId string) string {
-	return fmt.Sprintf("sb-stress-%d-%s", counter.Add(1), targetId[:8])
+	return fmt.Sprintf("sb-stress-%d-%s", time.Now().Unix(), targetId[:8])
 }
 
 func (s *Stress) Exited() (bool, error) {