From 16284e34f1b0fbc97b50f426aec5334f6c0d3a37 Mon Sep 17 00:00:00 2001 From: deepthi Date: Wed, 30 Jan 2019 14:41:55 -0800 Subject: [PATCH] Revert "change ClusterAlias in _vt.local_metadata to be keyspace/shard instead of keyspace.shard" This reverts commit 8ea39c31a45ff97385247b32535ca181b0e2e5e2. Signed-off-by: deepthi --- go/vt/vttablet/tabletmanager/restore.go | 2 +- test/backup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/go/vt/vttablet/tabletmanager/restore.go b/go/vt/vttablet/tabletmanager/restore.go index d61bfff2d85..55a3a57285d 100644 --- a/go/vt/vttablet/tabletmanager/restore.go +++ b/go/vt/vttablet/tabletmanager/restore.go @@ -189,7 +189,7 @@ func (agent *ActionAgent) getLocalMetadataValues(tabletType topodatapb.TabletTyp tablet := agent.Tablet() values := map[string]string{ "Alias": topoproto.TabletAliasString(tablet.Alias), - "ClusterAlias": fmt.Sprintf("%s/%s", tablet.Keyspace, tablet.Shard), + "ClusterAlias": fmt.Sprintf("%s.%s", tablet.Keyspace, tablet.Shard), "DataCenter": tablet.Alias.Cell, "PromotionRule": "must_not", } diff --git a/test/backup.py b/test/backup.py index 7de8b683851..78e8735fb9b 100755 --- a/test/backup.py +++ b/test/backup.py @@ -297,7 +297,7 @@ def _test_backup(self, tablet_type): for row in result: metadata[row[0]] = row[1] self.assertEqual(metadata['Alias'], 'test_nj-0000062346') - self.assertEqual(metadata['ClusterAlias'], 'test_keyspace/0') + self.assertEqual(metadata['ClusterAlias'], 'test_keyspace.0') self.assertEqual(metadata['DataCenter'], 'test_nj') if tablet_type == 'replica': self.assertEqual(metadata['PromotionRule'], 'neutral')