Skip to content

Adding check to prevent duplicate Network Container creation #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 6, 2018
Merged

Adding check to prevent duplicate Network Container creation #190

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13fc6f0
Adding check to prevent AzureNetworkContainer.exe from running if nc …
Jul 6, 2018
66c7831
Making changes as per Tamilmani.
Jul 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions cns/restserver/restserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -915,13 +915,22 @@ func (service *httpRestService) createOrUpdateNetworkContainer(w http.ResponseWr
switch r.Method {
case "POST":
if req.NetworkContainerType == cns.WebApps {
nc := service.networkContainer
if err := nc.Create(req); err != nil {
returnMessage = fmt.Sprintf("[Azure CNS] Error. CreateOrUpdateNetworkContainer failed %v", err.Error())
returnCode = UnexpectedError
break
// try to get the saved nc state if it exists
service.lock.Lock()
existing, ok := service.state.ContainerStatus[req.NetworkContainerid]
service.lock.Unlock()

// create/update nc only if it doesn't exist or it exists and the requested version is different from the saved version
if !ok || (ok && existing.VMVersion != req.Version) {
nc := service.networkContainer
if err = nc.Create(req); err != nil {
returnMessage = fmt.Sprintf("[Azure CNS] Error. CreateOrUpdateNetworkContainer failed %v", err.Error())
returnCode = UnexpectedError
break
}
}
}

returnCode, returnMessage = service.saveNetworkContainerGoalState(req)

default:
Expand Down Expand Up @@ -967,6 +976,9 @@ func (service *httpRestService) getNetworkContainerResponse(req cns.GetNetworkCo
var containerID string
var getNetworkContainerResponse cns.GetNetworkContainerResponse

service.lock.Lock()
defer service.lock.Unlock()

switch service.state.OrchestratorType {
case cns.Kubernetes:
var podInfo cns.KubernetesPodInfo
Expand Down Expand Up @@ -1049,7 +1061,11 @@ func (service *httpRestService) deleteNetworkContainer(w http.ResponseWriter, r
var containerStatus containerstatus
var ok bool

if containerStatus, ok = service.state.ContainerStatus[req.NetworkContainerid]; !ok {
service.lock.Lock()
containerStatus, ok = service.state.ContainerStatus[req.NetworkContainerid]
service.lock.Unlock()

if !ok {
log.Printf("Not able to retrieve network container details for this container id %v", req.NetworkContainerid)
break
}
Expand Down