add fix

Signed-off-by: Priya Bibra <pbibra@slack-corp.com>
slackhq · Jul 24, 2023 · d533ecd · d533ecd
1 parent 3f76531
commit d533ecd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/go/test/endtoend/recovery/unshardedrecovery/recovery.go b/go/test/endtoend/recovery/unshardedrecovery/recovery.go
@@ -295,12 +295,12 @@ func TestRecoveryImpl(t *testing.T) {
  session := vtgateConn.Session("@replica", nil)
 
  //check that vtgate doesn't route queries to new tablet
- recovery.VerifyQueriesUsingVtgate(t, session, "select count(*) from vt_insert_test", "INT64(3)")
- recovery.VerifyQueriesUsingVtgate(t, session, "select msg from vt_insert_test where id = 1", `VARCHAR("msgx2")`)
+ recovery.VerifyQueriesUsingVtgate(t, session, "select count(*) from vt_insert_test", "INT64(2)")
+ recovery.VerifyQueriesUsingVtgate(t, session, "select msg from vt_insert_test where id = 1", `VARCHAR("msgx1")`)
  recovery.VerifyQueriesUsingVtgate(t, session, fmt.Sprintf("select count(*) from %s.vt_insert_test", recoveryKS1), "INT64(1)")
  recovery.VerifyQueriesUsingVtgate(t, session, fmt.Sprintf("select msg from %s.vt_insert_test where id = 1", recoveryKS1), `VARCHAR("test1")`)
- recovery.VerifyQueriesUsingVtgate(t, session, fmt.Sprintf("select count(*) from %s.vt_insert_test", recoveryKS2), "INT64(2)")
- recovery.VerifyQueriesUsingVtgate(t, session, fmt.Sprintf("select msg from %s.vt_insert_test where id = 1", recoveryKS2), `VARCHAR("msgx1")`)
+ recovery.VerifyQueriesUsingVtgate(t, session, fmt.Sprintf("select count(*) from %s.vt_insert_test", recoveryKS2), "INT64(1)")
+ recovery.VerifyQueriesUsingVtgate(t, session, fmt.Sprintf("select msg from %s.vt_insert_test where id = 1", recoveryKS2), `VARCHAR("test1")`)
 
  // check that new keyspace is accessible with 'use ks'
  cluster.ExecuteQueriesUsingVtgate(t, session, "use "+recoveryKS1+"@replica")

diff --git a/go/vt/vttablet/tabletmanager/restore.go b/go/vt/vttablet/tabletmanager/restore.go
@@ -154,11 +154,11 @@ func (tm *TabletManager) restoreDataLocked(ctx context.Context, logger logutil.L
  return err
  }
 
- // // If backupTime not specified in restore_from_backup_ts, check to see if the keyspace has a SNAPSHOT time
- // // to restore from (for PITR)
- // if backupTime.IsZero() {
- //  backupTime = logutil.ProtoToTime(keyspaceInfo.SnapshotTime)
- // }
+ // If backupTime not specified in restore_from_backup_ts, check to see if the keyspace has a SNAPSHOT time
+ // to restore from (for PITR)
+ if backupTime.IsZero() {
+ backupTime = logutil.ProtoToTime(keyspaceInfo.SnapshotTime)
+ }
 
  // For a SNAPSHOT keyspace, we have to look for backups of BaseKeyspace
  // so we will pass the BaseKeyspace in RestoreParams instead of tablet.Keyspace