[Server::patch] config remove cluster.state block

Author: PotatoCloud

cmd/RedQueenUtil/append_cluster.go

@@ -19,7 +19,7 @@ func (c *appendCluster) exec() error {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*15)
 	defer cancel()
 
-	call, err := client.New(ctx, endpoints, true)
+	call, err := client.New(ctx, endpoints)
 	if err != nil {
 		return err
 	}

common/hack/unsafe.go

@@ -29,10 +29,6 @@ backend = "nuts"
     name = "node-1"
     peer-addr = "127.0.0.1:4539"
 
-# state options
-# new, existing
-state = "new"
-
 token = "red-queen-cluster"
 
 [log]

config.toml

@@ -29,10 +29,6 @@ backend = "nuts"
     name = "node-1"
     peer-addr = "127.0.0.1:4539"
 
-# state options
-# new, existing
-state = "new"
-
 token = "red-queen-cluster"
 
 [log]

config.toml.exam

@@ -3,10 +3,10 @@ package config
 import (
 	"flag"
 	"fmt"
-	"os"
-
 	"github.com/BurntSushi/toml"
 	"github.com/pkg/errors"
+	"os"
+	"path"
 )
 
 type ServerEnv interface {
@@ -15,7 +15,9 @@ type ServerEnv interface {
 }
 
 type env struct {
-	firstRun   bool
+	firstRun     bool
+	initLockFile string
+
 	configFile string
 }
 
@@ -54,8 +56,6 @@ type ClusterBootstrap struct {
 }
 
 type Cluster struct {
-	// State enum: new, existing
-	State     EnumClusterState   `toml:"state"`
 	Token     string             `toml:"token"`
 	Bootstrap []ClusterBootstrap `toml:"bootstrap"`
 }
@@ -85,7 +85,24 @@ type Config struct {
 }
 
 func (c *Config) setupEnv() {
-	c.env.firstRun = c.Cluster.State == ClusterStateNew
+	c.env.initLockFile = path.Join(c.Node.DataDir, ".init.lock")
+
+	// write init lock
+	if _, err := os.Stat(c.env.initLockFile); os.IsNotExist(err) {
+		c.env.firstRun = true
+
+		if err = os.MkdirAll(path.Clean(c.Node.DataDir), os.ModePerm); err != nil {
+			panic("Setup config error:" + err.Error())
+		}
+
+		f, err := os.OpenFile(c.env.initLockFile, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0644)
+		if err != nil {
+			panic("Setup config error:" + err.Error())
+		}
+		defer f.Close()
+		_, _ = f.WriteString("LOCK")
+	}
+
 }
 
 func (c *Config) Env() ServerEnv {
@@ -127,7 +144,6 @@ func bindServerFromArgs(cfg *Config, args ...string) error {
 	fs.Var(newValidatorStringValue[EnumNutsRWMode](DefaultStoreNutsRWMode, &cfg.Store.Nuts.RWMode), "nuts-rw-mode", "select read & write mode, options: fileio, mmap")
 
 	// main config::cluster
-	fs.Var(newValidatorStringValue[EnumClusterState](DefaultClusterState, &cfg.Cluster.State), "cluster-state", "status of the cluster at startup")
 	fs.StringVar(&cfg.Cluster.Token, "cluster-token", "", "")
 
 	// main config::cluster::bootstrap(s)
@@ -168,7 +184,6 @@ func bindServerFromEnv(cfg *Config) {
 	BindEnvVar(newValidatorStringValue[EnumNutsRWMode](DefaultStoreNutsRWMode, &cfg.Store.Nuts.RWMode), "RQ_NUTS_RW_MODE")
 
 	// main config::cluster
-	BindEnvVar(newValidatorStringValue[EnumClusterState](DefaultClusterState, &cfg.Cluster.State), "RQ_CLUSTER_STATE")
 	EnvStringVar(&cfg.Cluster.Token, "RQ_CLUSTER_TOKEN", "")
 
 	// main config::cluster::bootstrap(s)

config/config.go

@@ -23,12 +23,6 @@ const (
 	DefaultStoreNutsRWMode     string = "fileio"
 )
 
-// -- cluster default value
-
-const (
-	DefaultClusterState = string(ClusterStateNew)
-)
-
 // -- log default value
 
 const (

config/default.go

@@ -41,22 +41,6 @@ func (m EnumNutsRWMode) Valid() error {
 	}
 }
 
-type EnumClusterState string
-
-const (
-	ClusterStateNew      EnumClusterState = "new"
-	ClusterStateExisting EnumClusterState = "existing"
-)
-
-func (s EnumClusterState) Valid() error {
-	switch s {
-	case ClusterStateNew, ClusterStateExisting:
-		return nil
-	default:
-		return errors.New("unknown cluster state type")
-	}
-}
-
 type EnumLogLogger string
 
 const (
@@ -84,5 +68,5 @@ func (p FilePath) Valid() error {
 }
 
 type stringValidator interface {
-	EnumStoreBackend | EnumNutsRWMode | EnumClusterState | EnumLogLogger | FilePath
+	EnumStoreBackend | EnumNutsRWMode | EnumLogLogger | FilePath
 }

config/validator.go

@@ -0,0 +1,11 @@
+package hack
+
+import "unsafe"
+
+func Bytes2String(b []byte) string {
+	return *(*string)(unsafe.Pointer(&b))
+}
+
+func String2Bytes(s string) []byte {
+	return unsafe.Slice(unsafe.StringData(s), len(s))
+}

internal/hack/unsafe.go

@@ -1,9 +1,8 @@
 package hack_test
 
 import (
+	"github.com/RealFax/RedQueen/internal/hack"
 	"testing"
-
-	"github.com/RealFax/RedQueen/common/hack"
 )
 
 func TestString2Bytes(t *testing.T) {

common/hack/unsafe_test.go internal/hack/unsafe_test.gocommon/hack/unsafe_test.go renamed to internal/hack/unsafe_test.go

@@ -1,9 +1,9 @@
 package locker
 
 import (
+	"github.com/RealFax/RedQueen/internal/hack"
 	"time"
 
-	"github.com/RealFax/RedQueen/common/hack"
 	"github.com/RealFax/RedQueen/store"
 )