only enable ERS is we have VtorcConfig

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

Author: timvaillancourt

go/vt/vtctl/grpcvtctldserver/server.go

@@ -1156,6 +1156,7 @@ func (s *VtctldServer) DisableVtorcEmergencyReparent(ctx context.Context, req *v
 		return nil, err
 	}
 
+	// set DisableEmergencyReparent to true, init VtorcConfig if nil
 	if ki.VtorcConfig == nil {
 		ki.VtorcConfig = &topodatapb.VtorcConfig{}
 	}
@@ -1261,10 +1262,10 @@ func (s *VtctldServer) EnableVtorcEmergencyReparent(ctx context.Context, req *vt
 		return nil, err
 	}
 
-	if ki.VtorcConfig == nil {
-		ki.VtorcConfig = &topodatapb.VtorcConfig{}
+	// set DisableEmergencyReparent to false if we have a VtorcConfig
+	if ki.VtorcConfig != nil {
+		ki.VtorcConfig.DisableEmergencyReparent = false
 	}
-	ki.VtorcConfig.DisableEmergencyReparent = false
 
 	err = s.ts.UpdateKeyspace(ctx, ki)
 	if err != nil {