gsadmin/ziti
1
0
Fork 0
mirror of https://github.com/openziti/ziti.git synced 2026-10-13 15:51:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1356 from openziti/create-terminator-dups

Browse Source 
Handle duplicate tunnel terminator creation gracefully. Fixes #1355
This commit is contained in:
Paul Lorenz
2023-03-23 09:48:22 -04:00
committed by GitHub
parent 1343c95676 431df859b2
commit ee63137f75
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controller/handler_edge_ctrl/create_tunnel_terminator.go
+10 -3
View File
@@ -127,10 +127,17 @@ func (self *createTunnelTerminatorHandler) CreateTerminator(ctx *CreateTunnelTer
n := self.appEnv.GetHostController().GetNetwork()
err := n.Terminators.Create(terminator)
if err != nil {
self.returnError(ctx, internalError(err))
return
// terminator might have been created while we were trying to create.
terminator, _ = self.getNetwork().Terminators.Read(ctx.req.Address)
if terminator != nil {
logger.Info("terminator already exists")
} else {
self.returnError(ctx, internalError(err))
return
}
} else {
logger.Info("created terminator")
}
logger.Info("created terminator")
}
response := &edge_ctrl_pb.CreateTunnelTerminatorResponse{