[core] Fix missing env ID in a teardown log

knopers8 · teo · commit 75999d7fe401 · 2024-07-22T12:58:28.000+02:00
diff --git a/core/server.go b/core/server.go
@@ -695,7 +695,8 @@ func (m *RpcServer) DestroyEnvironment(cxt context.Context, req *pb.DestroyEnvir
 	if env.CurrentState() == "CONFIGURED" {
 		err = env.TryTransition(environment.MakeTransition(m.state.taskman, pb.ControlEnvironmentRequest_RESET))
 		if err != nil {
-			log.Warnf("cannot teardown environment in state %s, forcing", env.CurrentState())
+			log.WithField("partition", env.Id().String()).
+				Warnf("cannot teardown environment in state %s, forcing", env.CurrentState())
 			return m.doTeardownAndCleanup(env, true /*force*/, false /*keepTasks*/)
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -695,7 +695,8 @@ func (m RpcServer) DestroyEnvironment(cxt context.Context, req pb.DestroyEnvir`
`695`	`695`	`if env.CurrentState() == "CONFIGURED" {`
`696`	`696`	`err = env.TryTransition(environment.MakeTransition(m.state.taskman, pb.ControlEnvironmentRequest_RESET))`
`697`	`697`	`if err != nil {`
`698`		`- log.Warnf("cannot teardown environment in state %s, forcing", env.CurrentState())`
	`698`	`+ log.WithField("partition", env.Id().String()).`
	`699`	`+ Warnf("cannot teardown environment in state %s, forcing", env.CurrentState())`
`699`	`700`	`return m.doTeardownAndCleanup(env, true /force/, false /keepTasks/)`
`700`	`701`	`}`
`701`	`702`	`}`