Skip to content

Commit

Permalink
Merge pull request #4574 from planetscale/ds-cluster-alias
Browse files Browse the repository at this point in the history
Revert "change ClusterAlias in _vt.local_metadata ...
  • Loading branch information
sougou authored Jan 31, 2019
2 parents 207b084 + 16284e3 commit 1fe68aa
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion go/vt/vttablet/tabletmanager/restore.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}
Expand Down
2 changes: 1 addition & 1 deletion test/backup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down

0 comments on commit 1fe68aa

Please sign in to comment.