Merge pull request #391 from cvaroqui/main

misc

CHANGELOG.md

@@ -114,6 +114,13 @@
 
 * **breaking change:** "om node freeze" is now local only. Use "om cluster freeze" for the orchestrated freeze of all nodes. Same applies to "unfreeze" and its hidden alias "thaw".
 
+* **breaking change:** "om ... set|unset" no longer accept --param and --value. Use --kw instead, which was also supported in v2.
+
+* "om monitor" instance availability icons changes:
+
+	standby down: s => x
+	standby up:   S => o
+
 ### driver ip
 
 * **breaking change:** Drop the `dns_name_suffix`, `provisioner`, `dns_update` keywords. The zone management feature of the collector will be dropped in the collector too.

cmd/root.go

@@ -39,7 +39,7 @@ var (
 	bashCompletionFunction string
 
 	root = &cobra.Command{
-		Use:                    "om3",
+		Use:                    filepath.Base(os.Args[0]),
 		Short:                  "Manage the opensvc cluster infrastructure and its deployed services.",
 		PersistentPreRunE:      persistentPreRunE,
 		SilenceUsage:           true,

core/cluster/frame.go

@@ -39,16 +39,16 @@ var (
 	iconDownIssue      = red("X")
 	iconPlacementAlert = red("^")
 	iconProvisionAlert = red("P")
-	iconStandbyDown    = red("o")
-	iconStandbyUpIssue = red("x")
+	iconStandbyDown    = red("x")
+	iconStandbyUpIssue = red("o")
 	iconUndef          = red("?")
 	iconFrozen         = blue("*")
 	iconDown           = hiblack("X")
 	iconDRP            = hiblack("#")
 	iconLeader         = hiblack("^")
 	iconNotApplicable  = hiblack("/")
 	iconPreserved      = hiblack("?")
-	iconStandbyUp      = hiblack("x")
+	iconStandbyUp      = hiblack("o")
 )
 
 type (

core/commands/node_events.go

@@ -275,11 +275,12 @@ func (t *CmdNodeEvents) doEvent(e event.Event) {
 	ce := e.AsConcreteEvent(msg)
 	if t.templ != nil {
 		var i any
-		if err := json.Unmarshal(e.Data, &i); err != nil {
+		if b, err := json.Marshal(ce); err != nil {
+			return
+		} else if err := json.Unmarshal(b, &i); err != nil {
 			_, _ = fmt.Fprintf(os.Stderr, "unmarshal event data in a any-typed variable: %s\n", err)
 			return
 		}
-		msg.GetLabels()
 		if err := t.templ.Execute(os.Stdout, i); err != nil {
 			_, _ = fmt.Fprintf(os.Stderr, "template execute error %s\n", err)
 		}

core/commands/object_create.go

@@ -63,16 +63,24 @@ func (t *CmdObjectCreate) Run(selector, kind string) error {
 }
 
 func (t *CmdObjectCreate) parseSelector(selector, kind string) (path.T, error) {
-	if selector == "" {
+	var objectPath string
+	if selector != "" && t.ObjectSelector != "" {
+		return path.T{}, fmt.Errorf("use either 'om <path> create' or 'om <kind> create -s <path>', not 'om <path> create -s <path>'")
+	} else if selector == "" && t.ObjectSelector != "" {
+		objectPath = t.ObjectSelector
+	} else {
+		objectPath = selector
+	}
+	if objectPath == "" {
 		// allowed with multi-definitions fed via stdin
 		return path.T{}, nil
 	}
-	p, err := path.Parse(selector)
+	p, err := path.Parse(objectPath)
 	if err != nil {
 		return p, err
 	}
 	// now we know the path is valid. Verify it is non-existing or matches only one object.
-	objectSelector := mergeSelector(selector, t.ObjectSelector, kind, "**")
+	objectSelector := mergeSelector(objectPath, "", kind, "**")
 	paths, err := objectselector.NewSelection(
 		objectSelector,
 		objectselector.SelectionWithLocal(t.Local),

core/instance/monitor.go

@@ -2,6 +2,7 @@ package instance
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"strings"
 	"time"
@@ -15,15 +16,28 @@ type (
 		GlobalExpect          MonitorGlobalExpect `json:"global_expect" yaml:"global_expect"`
 		GlobalExpectUpdatedAt time.Time           `json:"global_expect_updated_at" yaml:"global_expect_updated_at"`
 		GlobalExpectOptions   any                 `json:"global_expect_options" yaml:"global_expect_options"`
-		IsLeader              bool                `json:"is_leader" yaml:"is_leader"`
-		IsHALeader            bool                `json:"is_ha_leader" yaml:"is_ha_leader"`
-		LocalExpect           MonitorLocalExpect  `json:"local_expect" yaml:"local_expect"`
-		LocalExpectUpdatedAt  time.Time           `json:"local_expect_updated_at" yaml:"local_expect_updated_at"`
+
+		// IsLeader flags the instance as the one where to provision as leader.
+		// The provisioning leader is responsible for preparing the shared resources.
+		// There can be only one leader, whatever the topology.
+		IsLeader bool `json:"is_leader" yaml:"is_leader"`
+
+		// IsHALeader flags the instances to start automatically if orchestrate=ha
+		// or when the admin posted a start orchestration.
+		// There can be one leader on a failover object, or many leaders with a flex topology.
+		IsHALeader bool `json:"is_ha_leader" yaml:"is_ha_leader"`
+
+		LocalExpect          MonitorLocalExpect `json:"local_expect" yaml:"local_expect"`
+		LocalExpectUpdatedAt time.Time          `json:"local_expect_updated_at" yaml:"local_expect_updated_at"`
 
 		// OrchestrationId is the accepted orchestration id that will be unset
 		// when orchestration is reached on local node
 		OrchestrationId uuid.UUID `json:"orchestration_id" yaml:"orchestration_id"`
 
+		// OrchestrationIsDone is set by the orchestration when it decides the instance state has reached its target.
+		// A orchestration is cleaned up when all instance monitors have OrchestrationIsDone set.
+		OrchestrationIsDone bool `json:"orchestration_is_done" yaml:"orchestration_is_done"`
+
 		SessionId               uuid.UUID          `json:"session_id" yaml:"session_id"`
 		State                   MonitorState       `json:"state" yaml:"state"`
 		StateUpdatedAt          time.Time          `json:"state_updated_at" yaml:"state_updated_at"`
@@ -73,7 +87,6 @@ const (
 	MonitorStateBootFailed
 	MonitorStateBooting
 	MonitorStateIdle
-	MonitorStateReached
 	MonitorStateDeleted
 	MonitorStateDeleting
 	MonitorStateFreezeFailed
@@ -137,7 +150,6 @@ var (
 		MonitorStateProvisioning:      "provisioning",
 		MonitorStateProvisionFailed:   "provision failed",
 		MonitorStatePurgeFailed:       "purge failed",
-		MonitorStateReached:           "reached",
 		MonitorStateReady:             "ready",
 		MonitorStateShutting:          "shutting",
 		MonitorStateStarted:           "started",
@@ -172,7 +184,6 @@ var (
 		"provisioning":       MonitorStateProvisioning,
 		"provision failed":   MonitorStateProvisionFailed,
 		"purge failed":       MonitorStatePurgeFailed,
-		"reached":            MonitorStateReached,
 		"ready":              MonitorStateReady,
 		"shutting":           MonitorStateShutting,
 		"started":            MonitorStateStarted,
@@ -232,6 +243,13 @@ var (
 		"unprovisioned": MonitorGlobalExpectUnprovisioned,
 		"none":          MonitorGlobalExpectNone,
 	}
+
+	ErrInvalidGlobalExpect = errors.New("invalid instance monitor global expect")
+	ErrInvalidLocalExpect  = errors.New("invalid instance monitor local expect")
+	ErrInvalidState        = errors.New("invalid instance monitor state")
+	ErrSameGlobalExpect    = errors.New("instance monitor global expect is already set to the same value")
+	ErrSameLocalExpect     = errors.New("instance monitor local expect is already set to the same value")
+	ErrSameState           = errors.New("instance monitor state is already set to the same value")
 )
 
 func (t MonitorState) IsDoing() bool {

core/node/monitor.go

@@ -1,6 +1,7 @@
 package node
 
 import (
+	"errors"
 	"fmt"
 	"strings"
 	"time"
@@ -138,6 +139,13 @@ var (
 		MonitorStateShutting:    nil,
 		MonitorStateRejoin:      nil,
 	}
+
+	ErrInvalidGlobalExpect = errors.New("invalid node monitor global expect")
+	ErrInvalidLocalExpect  = errors.New("invalid node monitor local expect")
+	ErrInvalidState        = errors.New("invalid node monitor state")
+	ErrSameGlobalExpect    = errors.New("node monitor global expect is already set to the same value")
+	ErrSameLocalExpect     = errors.New("node monitor local expect is already set to the same value")
+	ErrSameState           = errors.New("node monitor state is already set to the same value")
 )
 
 func (t MonitorState) IsDoing() bool {

core/nodeaction/node.go

@@ -276,9 +276,13 @@ func (t T) DoAsync() error {
 	case 400:
 		return fmt.Errorf("%s", resp.JSON400)
 	case 401:
-		return fmt.Errorf("%s", resp.JSON403)
-	case 403:
 		return fmt.Errorf("%s", resp.JSON401)
+	case 403:
+		return fmt.Errorf("%s", resp.JSON403)
+	case 408:
+		return fmt.Errorf("%s", resp.JSON408)
+	case 409:
+		return fmt.Errorf("%s", resp.JSON409)
 	case 500:
 		return fmt.Errorf("%s", resp.JSON500)
 	default:

core/object/actor_status.go

@@ -10,6 +10,7 @@ import (
 	"github.com/opensvc/om3/core/actioncontext"
 	"github.com/opensvc/om3/core/colorstatus"
 	"github.com/opensvc/om3/core/instance"
+	"github.com/opensvc/om3/core/provisioned"
 	"github.com/opensvc/om3/core/rawconfig"
 	"github.com/opensvc/om3/core/resource"
 	"github.com/opensvc/om3/core/status"
@@ -128,6 +129,17 @@ func (t *actor) resourceStatusEval(ctx context.Context, data *instance.Status) e
 	var mu sync.Mutex
 	err := t.ResourceSets().Do(ctx, t, "", "status", func(ctx context.Context, r resource.Driver) error {
 		xd := resource.GetExposedStatus(ctx, r)
+
+		// If the resource is up but the provisioned flag is unset, set
+		// the provisioned flag.
+		if xd.Provisioned.State == provisioned.False {
+			switch xd.Status {
+			case status.Up, status.StandbyUp:
+				resource.SetProvisioned(ctx, r)
+				xd.Provisioned.State = provisioned.True
+			}
+		}
+
 		mu.Lock()
 		resources = append(resources, xd)
 		data.Resources = resources

core/objectaction/object.go

@@ -410,9 +410,13 @@ func (t T) DoAsync() error {
 			case 400:
 				err = fmt.Errorf("%s", resp.JSON400)
 			case 401:
-				err = fmt.Errorf("%s", resp.JSON403)
-			case 403:
 				err = fmt.Errorf("%s", resp.JSON401)
+			case 403:
+				err = fmt.Errorf("%s", resp.JSON403)
+			case 408:
+				err = fmt.Errorf("%s", resp.JSON408)
+			case 409:
+				err = fmt.Errorf("%s", resp.JSON409)
 			case 500:
 				err = fmt.Errorf("%s", resp.JSON500)
 			}
@@ -431,37 +435,48 @@ func (t T) DoAsync() error {
 			case 400:
 				err = fmt.Errorf("%s", resp.JSON400)
 			case 401:
-				err = fmt.Errorf("%s", resp.JSON403)
-			case 403:
 				err = fmt.Errorf("%s", resp.JSON401)
+			case 403:
+				err = fmt.Errorf("%s", resp.JSON403)
+			case 408:
+				err = fmt.Errorf("%s", resp.JSON408)
+			case 409:
+				err = fmt.Errorf("%s", resp.JSON409)
 			case 500:
 				err = fmt.Errorf("%s", resp.JSON500)
 			}
 		}
-		if err != nil {
-			errs = errors.Join(errs, err)
-		} else {
-			toWait++
-		}
-		var monitorUpdateQueued api.MonitorUpdateQueued
 		var r result
-		if err := json.Unmarshal(b, &monitorUpdateQueued); err == nil {
-			r = result{
-				OrchestrationId: monitorUpdateQueued.OrchestrationId,
-				Path:            p.String(),
-			}
-		} else {
+		if err != nil {
 			r = result{
 				Error: err,
 				Path:  p.String(),
 			}
+		} else {
+			toWait++
+			var monitorUpdateQueued api.MonitorUpdateQueued
+			if err := json.Unmarshal(b, &monitorUpdateQueued); err == nil {
+				r = result{
+					OrchestrationId: monitorUpdateQueued.OrchestrationId,
+					Path:            p.String(),
+				}
+			} else {
+				r = result{
+					Error: err,
+					Path:  p.String(),
+				}
+			}
 		}
 		rs = append(rs, r)
 	}
 	human := func() string {
 		s := ""
 		for _, r := range rs {
-			s += fmt.Sprintf("%s: %s\n", r.Path, r.OrchestrationId)
+			if r.Error != nil {
+				s += fmt.Sprintf("%s %s %s\n", r.OrchestrationId, r.Path, rawconfig.Colorize.Error(r.Error))
+			} else {
+				s += fmt.Sprintf("%s %s\n", r.OrchestrationId, r.Path)
+			}
 		}
 		return s
 	}

core/xconfig/main.go

@@ -1195,7 +1195,7 @@ func (t *T) CommitDataToInvalid(configData rawconfig.T, configPath string) error
 	return t.rawCommit(configData, configPath, false)
 }
 
-func (t T) DeleteSections(sections []string) error {
+func (t *T) DeleteSections(sections []string) error {
 	deleted := 0
 	for _, section := range sections {
 		if _, err := t.file.GetSection(section); err != nil {
@@ -1205,6 +1205,7 @@ func (t T) DeleteSections(sections []string) error {
 		deleted++
 	}
 	if deleted > 0 {
+		t.changed = true
 		t.Commit()
 	}
 	return nil

daemon/api/api.yaml

@@ -489,6 +489,10 @@ paths:
           $ref: '#/components/responses/401'
         403:
           $ref: '#/components/responses/403'
+        408:
+          $ref: '#/components/responses/408'
+        409:
+          $ref: '#/components/responses/409'
         500:
           $ref: '#/components/responses/500'
   /nodes/info:
@@ -696,6 +700,10 @@ paths:
           $ref: '#/components/responses/401'
         403:
           $ref: '#/components/responses/403'
+        408:
+          $ref: '#/components/responses/408'
+        409:
+          $ref: '#/components/responses/409'
         500:
           $ref: '#/components/responses/500'
   /object/progress:
@@ -773,6 +781,10 @@ paths:
           $ref: '#/components/responses/401'
         403:
           $ref: '#/components/responses/403'
+        408:
+          $ref: '#/components/responses/408'
+        409:
+          $ref: '#/components/responses/409'
         500:
           $ref: '#/components/responses/500'
   /pools:
@@ -1920,6 +1932,20 @@ components:
         application/json:
           schema:
             $ref: "#/components/schemas/Problem"
+    '408':
+      type: object
+      description: Request Timeout
+      content:
+        application/json:
+          schema:
+            $ref: "#/components/schemas/Problem"
+    '409':
+      type: object
+      description: Conflict
+      content:
+        application/json:
+          schema:
+            $ref: "#/components/schemas/Problem"
     '500':
       type: object
       description: Internal Server Error