resolve main and V3.0.0 conflicts

Author: yb

platforms/kubernetes/postgres-operator/deploy/postgresql.yaml

@@ -46,6 +46,7 @@ spec:
       - enable_seqscan=on
     podspec:
       terminationGracePeriodSeconds: 60
+#      priorityClassName: high-priority
       containers:
         - image: radondb-postgresql:15.0-v1.1.0
           imagePullPolicy: IfNotPresent

platforms/kubernetes/postgres-operator/postgres/constants.py

@@ -123,6 +123,11 @@
 SPEC_ANTIAFFINITY_PODANTIAFFINITYTERM = "podAntiAffinityTerm"
 SPEC_ANTIAFFINITY_TOPOLOGYKEY = "topologyKey"
 
+# pod PriorityClass
+SPEC_POD_PRIORITY_CLASS = "priorityClassName"
+SPEC_POD_PRIORITY_CLASS_SCOPE_NODE = "system-node-critical"
+SPEC_POD_PRIORITY_CLASS_SCOPE_CLUSTER = "system-cluster-critical"
+
 # time
 SECONDS = 1
 MINUTES = SECONDS * 60

platforms/kubernetes/postgres-operator/postgres/handle.py

@@ -139,6 +139,9 @@
     HOURS,
     DAYS,
     UPDATE_TOLERATION,
+    SPEC_POD_PRIORITY_CLASS,
+    SPEC_POD_PRIORITY_CLASS_SCOPE_NODE,
+    SPEC_POD_PRIORITY_CLASS_SCOPE_CLUSTER,
 )
 
 PGLOG_DIR = "log"
@@ -680,6 +683,8 @@ def create_statefulset(
         "serviceName"] = statefulset_name_get_service_name(name)
     podspec = podspec_need_copy.copy()
     podspec["restartPolicy"] = "Always"
+    podspec.setdefault(SPEC_POD_PRIORITY_CLASS,
+                       SPEC_POD_PRIORITY_CLASS_SCOPE_CLUSTER)
     antiaffinity = antiaffinity_need_copy.copy()
     is_required = antiaffinity[
         SPEC_ANTIAFFINITY_POLICY] == SPEC_ANTIAFFINITY_REQUIRED
@@ -3011,6 +3016,37 @@ def update_number_sync_standbys(
                 break
         autofailover_conns.free_conns()
 
+def update_number_sync_standbys(
+    meta: kopf.Meta,
+    spec: kopf.Spec,
+    patch: kopf.Patch,
+    status: kopf.Status,
+    logger: logging.Logger,
+) -> None:
+    mode, autofailover_replicas, readwrite_replicas, readonly_replicas = get_replicas(
+        spec)
+
+    pg_nodes = readwrite_replicas + readonly_replicas
+    number_sync = readwrite_replicas + readonly_replicas if spec[POSTGRESQL][READONLYINSTANCE][STREAMING] == STREAMING_SYNC else readwrite_replicas
+    expect_number = number_sync - 2
+    if expect_number < 0:
+        expect_number = 0
+
+    if pg_nodes >= 2:
+        autofailover_conns = connections(spec, meta, patch,
+                                         get_field(AUTOFAILOVER), False,
+                                         None, logger, None, status, False)
+        cmd = [
+            "pgtools", "-S",
+            "' formation number-sync-standbys  " + str(expect_number) + PRIMARY_FORMATION + "'"
+        ]
+        logger.info(f"set number-sync-standbys with cmd {cmd}")
+        output = exec_command(autofailover_conns.get_conns()[0], cmd, logger, interrupt=False)
+        if output.find(SUCCESS) == -1:
+            logger.error(
+                    f"set number-sync-standbys failed {cmd}  {output}")
+        autofailover_conns.free_conns()
+
 
 def update_streaming(
     meta: kopf.Meta,