From 6b6fe114eed2ffce9aa88bdcffa1af76e1e98c73 Mon Sep 17 00:00:00 2001
From: Arnav Agarwal <14933889+Arnav15@users.noreply.github.com>
Date: Thu, 3 Mar 2022 15:05:34 -0800
Subject: [PATCH] Fix restore failures due to incorrect IP usage

Summary:
A recent revert of the code also inadvertently caused a necessary piece of code to get
changed, causing failures to restores in case of dual NIC clusters.
Culprit PR: D15306

Test Plan: Create a dual NIC cluster, create a backup, restore a backup. Also run an itest.

Reviewers: daniel

Reviewed By: daniel

Subscribers: yugaware

Differential Revision: https://phabricator.dev.yugabyte.com/D15798
---
 managed/devops/bin/yb_backup.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/managed/devops/bin/yb_backup.py b/managed/devops/bin/yb_backup.py
index 9d6023e3067c..f356aef0dc02 100755
--- a/managed/devops/bin/yb_backup.py
+++ b/managed/devops/bin/yb_backup.py
@@ -2917,6 +2917,8 @@ def find_tablet_replicas(self, snapshot_metadata):
                 if LEADING_UUID_RE.match(line):
                     (ts_uuid, ts_ip_port, role) = split_by_tab(line)
                     (ts_ip, ts_port) = ts_ip_port.split(':')
+                    if self.ts_secondary_to_primary_ip_map:
+                        ts_ip = self.ts_secondary_to_primary_ip_map[ts_ip]
                     tablets_by_tserver_ip.setdefault(ts_ip, set()).add(new_id)
 
         return tablets_by_tserver_ip