fix(site-replication): identify the local site by deployment ID instead of list position (#219)

Author: reatang

app/(dashboard)/site-replication/page.tsx

@@ -35,9 +35,11 @@ import { Spinner } from "@/components/ui/spinner"
 import { useDataTable } from "@/hooks/use-data-table"
 import { usePermissions } from "@/hooks/use-permissions"
 import { useSiteReplication } from "@/hooks/use-site-replication"
+import { useSystem } from "@/hooks/use-system"
 import { formatDateTime, niceBytes } from "@/lib/functions"
 import { useDialog } from "@/lib/feedback/dialog"
 import { useMessage } from "@/lib/feedback/message"
+import { extractServerDeploymentId, resolveSiteReplicationLocalSite } from "@/lib/site-replication-local-site"
 import { isHttpsSiteReplicationEndpoint } from "@/lib/site-replication-tls"
 import type {
   SiteReplicationInfo,
@@ -117,9 +119,11 @@ export default function SiteReplicationPage() {
     resyncSiteReplication,
     setSiteReplicationIlmExpiry,
   } = useSiteReplication()
+  const { getSystemInfo } = useSystem()
 
   const [info, setInfo] = useState<SiteReplicationInfo | null>(null)
   const [status, setStatus] = useState<SiteReplicationStatus | null>(null)
+  const [serverDeploymentId, setServerDeploymentId] = useState("")
   const [loading, setLoading] = useState(false)
   const [error, setError] = useState<string | null>(null)
   const [featureUnavailable, setFeatureUnavailable] = useState(false)
@@ -140,6 +144,14 @@ export default function SiteReplicationPage() {
     setFeatureUnavailable(false)
     setStatusUnavailable(false)
 
+    // The local deployment ID is the only stable way to tell which entry of
+    // the shared, deployment-ID-sorted site list belongs to this server. Fetch
+    // it alongside the replication data; a failure here only degrades the
+    // "current site" identification, so it must not fail the whole page.
+    const serverDeploymentIdPromise = getSystemInfo(undefined, { suppress403Redirect: true })
+      .then(extractServerDeploymentId)
+      .catch(() => "")
+
     try {
       let nextInfo: SiteReplicationInfo | null = null
       let nextStatus: SiteReplicationStatus | null = null
@@ -168,25 +180,30 @@ export default function SiteReplicationPage() {
         }
       }
 
+      setServerDeploymentId(await serverDeploymentIdPromise)
       setInfo(nextInfo)
       setStatus(nextStatus)
     } catch (loadError) {
       setError((loadError as Error).message || t("Load Failed"))
     } finally {
       setLoading(false)
     }
-  }, [getSiteReplicationInfo, getSiteReplicationStatus, t])
+  }, [getSiteReplicationInfo, getSiteReplicationStatus, getSystemInfo, t])
 
   useEffect(() => {
     void loadData()
   }, [loadData])
 
   const peers = info?.sites ?? []
   const ilmExpiryEnabled = peers.some((peer) => peer.replicateIlmExpiry)
-  const localDeploymentId =
-    Object.keys(status?.metrics.metrics ?? {})[0] ??
-    peers.find((peer) => peer.name && peer.name === info?.name)?.deploymentId ??
-    ""
+  // Never pick the local site by array or key position: every site returns
+  // the same list in the same order (issue rustfs/rustfs#7072).
+  const localSite = resolveSiteReplicationLocalSite({
+    serverDeploymentId,
+    localName: info?.name,
+    peers,
+  })
+  const localDeploymentId = localSite.deploymentId
   const localPeer = peers.find((peer) => peer.deploymentId === localDeploymentId) ?? null
   const localSummary = (localDeploymentId && status?.statsSummary[localDeploymentId]) || null
   const localMetric = (localDeploymentId && status?.metrics.metrics[localDeploymentId]) || null
@@ -586,6 +603,13 @@ export default function SiteReplicationPage() {
               label={t("Deployment ID")}
               value={<span className="font-mono text-xs break-all">{localDeploymentId || "--"}</span>}
             />
+            {info?.enabled && !localDeploymentId ? (
+              <p className="text-xs text-muted-foreground" role="note">
+                {localSite.ambiguousName
+                  ? t("Multiple peers share the local site name, so the current site cannot be identified.")
+                  : t("The current site could not be identified because the server did not report its deployment ID.")}
+              </p>
+            ) : null}
           </CardContent>
         </Card>
 

hooks/use-system.ts

@@ -7,8 +7,11 @@ export function useSystem() {
   const api = useApi()
 
   const getSystemInfo = useCallback(
-    async (signal?: AbortSignal) => {
-      return api.get("/info", signal ? { signal, dedupe: false } : undefined)
+    async (signal?: AbortSignal, options?: { suppress403Redirect?: boolean }) => {
+      return api.get("/info", {
+        ...(signal ? { signal, dedupe: false } : {}),
+        ...(options?.suppress403Redirect ? { suppress403Redirect: true } : {}),
+      })
     },
     [api],
   )

i18n/locales/ar-MA.json

@@ -1163,6 +1163,8 @@
   "The exported file contains sensitive information. Please keep it secure.": "يحتوي الملف المُصدَّر على معلومات حساسة. يرجى الحفاظ عليه بأمان.",
   "The secret key is shown only once. Copy or export it before closing.": "يتم عرض المفتاح السري مرة واحدة فقط. انسخه أو صدّره قبل الإغلاق.",
   "The server detects the local site identity from the active RustFS deployment.": "يكتشف الخادم هوية الموقع المحلي من نشر RustFS النشط.",
+  "Multiple peers share the local site name, so the current site cannot be identified.": "تشترك عدة مواقع نظيرة في اسم الموقع المحلي نفسه، لذا يتعذر تحديد الموقع الحالي.",
+  "The current site could not be identified because the server did not report its deployment ID.": "تعذر تحديد الموقع الحالي لأن الخادم لم يُبلغ عن معرّف النشر الخاص به.",
   "The two passwords are inconsistent": "كلمتا المرور غير متطابقتين",
   "The value is used only for the initial join request.": "تُستخدم هذه القيمة فقط في طلب الانضمام الأولي.",
   "This action cannot be undone and will bypass the normal deletion process.": "لا يمكن التراجع عن هذا الإجراء وسيتجاوز عملية الحذف العادية.",

i18n/locales/de-DE.json

@@ -1163,6 +1163,8 @@
   "The exported file contains sensitive information. Please keep it secure.": "Die exportierte Datei enthält sensible Informationen. Bitte bewahren Sie sie sicher auf.",
   "The secret key is shown only once. Copy or export it before closing.": "Der geheime Schlüssel wird nur einmal angezeigt. Kopieren oder exportieren Sie ihn vor dem Schließen.",
   "The server detects the local site identity from the active RustFS deployment.": "Der Server erkennt die lokale Site-Identität aus der aktiven RustFS-Bereitstellung.",
+  "Multiple peers share the local site name, so the current site cannot be identified.": "Mehrere Peers verwenden denselben lokalen Site-Namen, daher kann die aktuelle Site nicht ermittelt werden.",
+  "The current site could not be identified because the server did not report its deployment ID.": "Die aktuelle Site konnte nicht ermittelt werden, da der Server seine Deployment-ID nicht gemeldet hat.",
   "The two passwords are inconsistent": "Die beiden Passwörter stimmen nicht überein",
   "The value is used only for the initial join request.": "Dieser Wert wird nur für die erste Beitrittsanfrage verwendet.",
   "This action cannot be undone and will bypass the normal deletion process.": "Diese Aktion kann nicht rückgängig gemacht werden und umgeht den normalen Löschprozess.",

i18n/locales/en-US.json

@@ -1163,6 +1163,8 @@
   "The exported file contains sensitive information. Please keep it secure.": "The exported file contains sensitive information. Please keep it secure.",
   "The secret key is shown only once. Copy or export it before closing.": "The secret key is shown only once. Copy or export it before closing.",
   "The server detects the local site identity from the active RustFS deployment.": "The server detects the local site identity from the active RustFS deployment.",
+  "Multiple peers share the local site name, so the current site cannot be identified.": "Multiple peers share the local site name, so the current site cannot be identified.",
+  "The current site could not be identified because the server did not report its deployment ID.": "The current site could not be identified because the server did not report its deployment ID.",
   "The two passwords are inconsistent": "The two passwords are inconsistent",
   "The value is used only for the initial join request.": "The value is used only for the initial join request.",
   "This action cannot be undone and will bypass the normal deletion process.": "This action cannot be undone and will bypass the normal deletion process.",

i18n/locales/es-ES.json

@@ -1163,6 +1163,8 @@
   "The exported file contains sensitive information. Please keep it secure.": "El archivo exportado contiene información sensible. Manténgalo seguro.",
   "The secret key is shown only once. Copy or export it before closing.": "La clave secreta se muestra una sola vez. Cópiala o expórtala antes de cerrar.",
   "The server detects the local site identity from the active RustFS deployment.": "El servidor detecta la identidad del sitio local a partir de la implementación activa de RustFS.",
+  "Multiple peers share the local site name, so the current site cannot be identified.": "Varios pares comparten el nombre del sitio local, por lo que no se puede identificar el sitio actual.",
+  "The current site could not be identified because the server did not report its deployment ID.": "No se pudo identificar el sitio actual porque el servidor no informó su ID de despliegue.",
   "The two passwords are inconsistent": "Las dos contraseñas no coinciden",
   "The value is used only for the initial join request.": "El valor se usa solo para la solicitud inicial de unión.",
   "This action cannot be undone and will bypass the normal deletion process.": "Esta acción no se puede deshacer y omitirá el proceso normal de eliminación.",

i18n/locales/fr-FR.json

@@ -1163,6 +1163,8 @@
   "The exported file contains sensitive information. Please keep it secure.": "Le fichier exporté contient des informations sensibles. Veuillez le conserver en sécurité.",
   "The secret key is shown only once. Copy or export it before closing.": "La clé secrète n’est affichée qu’une seule fois. Copiez-la ou exportez-la avant de fermer.",
   "The server detects the local site identity from the active RustFS deployment.": "Le serveur détecte l'identité du site local à partir du déploiement RustFS actif.",
+  "Multiple peers share the local site name, so the current site cannot be identified.": "Plusieurs pairs partagent le nom du site local, le site actuel ne peut donc pas être identifié.",
+  "The current site could not be identified because the server did not report its deployment ID.": "Le site actuel n'a pas pu être identifié car le serveur n'a pas signalé son ID de déploiement.",
   "The two passwords are inconsistent": "Les deux mots de passe sont différents",
   "The value is used only for the initial join request.": "Cette valeur est utilisée uniquement pour la demande de jonction initiale.",
   "This action cannot be undone and will bypass the normal deletion process.": "Cette action ne peut pas être annulée et contournera le processus de suppression normal.",

i18n/locales/id-ID.json

@@ -1163,6 +1163,8 @@
   "The exported file contains sensitive information. Please keep it secure.": "File yang diekspor berisi informasi sensitif. Harap jaga keamanannya.",
   "The secret key is shown only once. Copy or export it before closing.": "Kunci rahasia hanya ditampilkan sekali. Salin atau ekspor sebelum menutup.",
   "The server detects the local site identity from the active RustFS deployment.": "Server mendeteksi identitas situs lokal dari deployment RustFS yang aktif.",
+  "Multiple peers share the local site name, so the current site cannot be identified.": "Beberapa peer menggunakan nama situs lokal yang sama, sehingga situs saat ini tidak dapat diidentifikasi.",
+  "The current site could not be identified because the server did not report its deployment ID.": "Situs saat ini tidak dapat diidentifikasi karena server tidak melaporkan deployment ID-nya.",
   "The two passwords are inconsistent": "Kedua kata sandi tidak cocok",
   "The value is used only for the initial join request.": "Nilai ini hanya digunakan untuk permintaan bergabung awal.",
   "This action cannot be undone and will bypass the normal deletion process.": "Tindakan ini tidak dapat dibatalkan dan akan melewati proses penghapusan normal.",

i18n/locales/it-IT.json

@@ -1163,6 +1163,8 @@
   "The exported file contains sensitive information. Please keep it secure.": "Il file esportato contiene informazioni sensibili. Conservalo in modo sicuro.",
   "The secret key is shown only once. Copy or export it before closing.": "La chiave segreta viene mostrata una sola volta. Copiala o esportala prima di chiudere.",
   "The server detects the local site identity from the active RustFS deployment.": "Il server rileva l'identità del sito locale dalla distribuzione RustFS attiva.",
+  "Multiple peers share the local site name, so the current site cannot be identified.": "Più peer condividono il nome del sito locale, quindi il sito corrente non può essere identificato.",
+  "The current site could not be identified because the server did not report its deployment ID.": "Impossibile identificare il sito corrente perché il server non ha riportato il proprio ID di deployment.",
   "The two passwords are inconsistent": "Le due password non corrispondono",
   "The value is used only for the initial join request.": "Il valore viene usato solo per la richiesta iniziale di adesione.",
   "This action cannot be undone and will bypass the normal deletion process.": "Questa azione non può essere annullata e bypasserà il normale processo di eliminazione.",

i18n/locales/ja-JP.json

@@ -1163,6 +1163,8 @@
   "The exported file contains sensitive information. Please keep it secure.": "エクスポートされたファイルには機密情報が含まれています。安全に保管してください。",
   "The secret key is shown only once. Copy or export it before closing.": "シークレットキーが表示されるのは一度だけです。閉じる前にコピーまたはエクスポートしてください。",
   "The server detects the local site identity from the active RustFS deployment.": "サーバーはアクティブな RustFS デプロイメントからローカルサイトの識別情報を検出します。",
+  "Multiple peers share the local site name, so the current site cannot be identified.": "複数のピアが同じローカルサイト名を共有しているため、現在のサイトを特定できません。",
+  "The current site could not be identified because the server did not report its deployment ID.": "サーバーが deployment ID を報告しなかったため、現在のサイトを特定できません。",
   "The two passwords are inconsistent": "2つのパスワードが一致しません",
   "The value is used only for the initial join request.": "この値は初回参加リクエストでのみ使用されます。",
   "This action cannot be undone and will bypass the normal deletion process.": "この操作は元に戻せず、通常の削除プロセスをバイパスします。",