fix

Signed-off-by: husharp <jinhao.hu@pingcap.com>
pingcap · Nov 10, 2023 · a756742 · a756742
1 parent da0221a
commit a756742
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/components/playground/instance/pd.go b/components/playground/instance/pd.go
@@ -37,7 +37,7 @@ const (
 	// PDRoleScheduling is the role of PD scheduling
 	PDRoleScheduling PDRole = "scheduling"
 	// PDRoleResourceManager is the role of PD resource manager
-	PDRoleResourceManager PDRole = "resource manager"
+	PDRoleResourceManager PDRole = "resource_manager"
 )
 
 // PDInstance represent a running pd-server

diff --git a/components/playground/playground.go b/components/playground/playground.go
@@ -697,6 +697,10 @@ func (p *Playground) addInstance(componentID string, pdRole instance.PDRole, tif
 
 	id := p.allocID(componentID)
 	dir := filepath.Join(dataDir, fmt.Sprintf("%s-%d", componentID, id))
+	if componentID == string(instance.PDRoleNormal) && pdRole != instance.PDRoleNormal {
+		id = p.allocID(fmt.Sprintf("%s-%s", componentID, pdRole))
+		dir = filepath.Join(dataDir, fmt.Sprintf("%s-%s-%d", componentID, pdRole, id))
+	}
 	if err = utils.MkdirAll(dir, 0755); err != nil {
 		return nil, err
 	}