Remove overriding host verson when IP already exist to avoid pending programming IPs become available after CNS restarts and restore from previous state. (#781)

csfmomo · web-flow · commit d4f1f4d4b2fd · 2021-02-11T15:40:01.000-08:00
diff --git a/cns/restserver/util.go b/cns/restserver/util.go
@@ -266,7 +266,6 @@ func (service *HTTPRestService) addIPConfigStateUntransacted(ncId string, hostVe
 		if existingIPConfig, existsInPreviousIPConfig := existingSecondaryIPConfigs[ipId]; existsInPreviousIPConfig {
 			ipconfig.NCVersion = existingIPConfig.NCVersion
 			ipconfigs[ipId] = ipconfig
-			hostVersion = existingIPConfig.NCVersion
 		}
 		logger.Printf("[Azure-Cns] Set IP %s version to %d, programmed host nc version is %d", ipconfig.IPAddress, ipconfig.NCVersion, hostVersion)
 		if _, exists := service.PodIPConfigState[ipId]; exists {

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,6 @@ func (service *HTTPRestService) addIPConfigStateUntransacted(ncId string, hostVe`
`266`	`266`	`if existingIPConfig, existsInPreviousIPConfig := existingSecondaryIPConfigs[ipId]; existsInPreviousIPConfig {`
`267`	`267`	`ipconfig.NCVersion = existingIPConfig.NCVersion`
`268`	`268`	`ipconfigs[ipId] = ipconfig`
`269`		`- hostVersion = existingIPConfig.NCVersion`
`270`	`269`	`}`
`271`	`270`	`logger.Printf("[Azure-Cns] Set IP %s version to %d, programmed host nc version is %d", ipconfig.IPAddress, ipconfig.NCVersion, hostVersion)`
`272`	`271`	`if _, exists := service.PodIPConfigState[ipId]; exists {`