fix problem with failover and switchover when patroni.host != patroni…

….name
veegres · Sep 7, 2024 · c03aa32 · c03aa32
1 parent 6558037
commit c03aa32
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/service/src/model/general.go b/service/src/model/general.go
@@ -88,6 +88,7 @@ const (
 type Sidecar struct {
 	Host   string         `json:"host" form:"host"`
 	Port   int            `json:"port" form:"port"`
+	Name   *string        `json:"name" form:"name"`
 	Status *SidecarStatus `json:"status,omitempty" form:"status"`
 }
 

diff --git a/service/src/service/patroni.go b/service/src/service/patroni.go
@@ -74,7 +74,7 @@ func (p *patroniInstanceService) Overview(instance InstanceRequest) ([]Instance,
 			Lag:                 lag,
 			PendingRestart:      patroniInstance.PendingRestart,
 			Database:            Database{Host: patroniInstance.Host, Port: patroniInstance.Port},
-			Sidecar:             Sidecar{Host: host, Port: port, Status: &sidecarStatus},
+			Sidecar:             Sidecar{Host: host, Port: port, Name: &patroniInstance.Name, Status: &sidecarStatus},
 			ScheduledRestart:    scheduledRestart,
 			ScheduledSwitchover: scheduledSwitchover,
 		})

diff --git a/web/src/component/shared/actions/FailoverButton.tsx b/web/src/component/shared/actions/FailoverButton.tsx
@@ -12,8 +12,8 @@ export function FailoverButton(props: Props) {
     const {request, cluster, disabled} = props
 
     const failover = useRouterInstanceFailover(cluster)
-
-    const body = {candidate: request.sidecar.host}
+    // NOTE: in patroni we cannot use host for leader and candidate, we need to send patroni.name
+    const body = {candidate: request.sidecar.name}
 
     return (
         <AlertButton

diff --git a/web/src/component/shared/actions/SwitchoverButton.tsx b/web/src/component/shared/actions/SwitchoverButton.tsx
@@ -19,7 +19,8 @@ export function SwitchoverButton(props: Props) {
     const [candidate, setCandidates] = useState("")
     const [schedule, setSchedule] = useState<Dayjs>()
     const switchover = useRouterInstanceSwitchover(cluster)
-    const body = {leader: request.sidecar.host, candidate, scheduled_at: schedule}
+    // NOTE: in patroni we cannot use host for leader and candidate, we need to send patroni.name
+    const body = {leader: request.sidecar.name, candidate, scheduled_at: schedule}
 
     return (
         <AlertButton
@@ -46,10 +47,11 @@ export function SwitchoverButton(props: Props) {
                     value={candidate}
                     onChange={(e) => setCandidates(e.target.value)}
                     fullWidth={true}
+                    variant={"outlined"}
                 >
                     <MenuItem value={""}><em>none (will be chosen randomly)</em></MenuItem>
                     {candidates.map(sidecar => (
-                        <MenuItem key={sidecar.host} value={sidecar.host}>{sidecar.host}</MenuItem>
+                        <MenuItem key={sidecar.host} value={sidecar.name}>{sidecar.host}</MenuItem>
                     ))}
                 </Select>
             </FormControl>

diff --git a/web/src/type/general.ts b/web/src/type/general.ts
@@ -80,6 +80,7 @@ export enum SidecarStatus {
 export interface Sidecar {
     host: string,
     port: number,
+    name?: string,
     status?: SidecarStatus,
 }