Skip to content

Remove lock for version command #970

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 6 commits into from
Aug 11, 2021
Merged

Remove lock for version command #970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
36db85d
remove lock for version command.
tamilmani1989 Aug 10, 2021
7bac0aa
Merge branch 'master' of https://github.com/Azure/azure-container-net…
tamilmani1989 Aug 10, 2021
641fa4d
linter error fix
tamilmani1989 Aug 10, 2021
f9521b3
sort imports
tamilmani1989 Aug 10, 2021
54e842e
addressed issues
tamilmani1989 Aug 10, 2021
abf657b
linter fix
tamilmani1989 Aug 10, 2021
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
14 changes: 10 additions & 4 deletions cni/cni.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,17 @@ import (

const (
// CNI commands.
Cmd = "CNI_COMMAND"
CmdAdd = "ADD"
CmdGet = "GET"
CmdDel = "DEL"
Cmd = "CNI_COMMAND"
// CmdAdd - CNI ADD command.
CmdAdd = "ADD"
// CmdGet - CNI GET command.
CmdGet = "GET"
// CmdDel - CNI DEL command.
CmdDel = "DEL"
// CmdUpdate - CNI UPDATE command.
CmdUpdate = "UPDATE"
// CmdVersion - CNI VERSION command.
CmdVersion = "VERSION"

// nonstandard CNI spec command, used to dump CNI state to stdout
CmdGetEndpointsState = "GET_ENDPOINT_STATE"
Expand Down
126 changes: 66 additions & 60 deletions cni/network/plugin/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,12 @@ import (
"reflect"
"time"

"github.com/Azure/azure-container-networking/nns"

"github.com/Azure/azure-container-networking/cni"
"github.com/Azure/azure-container-networking/cni/network"
"github.com/Azure/azure-container-networking/common"
acn "github.com/Azure/azure-container-networking/common"
"github.com/Azure/azure-container-networking/log"
"github.com/Azure/azure-container-networking/nns"
"github.com/Azure/azure-container-networking/platform"
"github.com/Azure/azure-container-networking/telemetry"
"github.com/containernetworking/cni/pkg/skel"
Expand Down Expand Up @@ -127,7 +126,6 @@ func handleIfCniUpdate(update func(*skel.CmdArgs) error) (bool, error) {

// Main is the entry point for CNI network plugin.
func main() {

startTime := time.Now()

// Initialize and parse command line arguments.
Expand All @@ -143,6 +141,7 @@ func main() {
config common.PluginConfig
err error
logDirectory string // This sets empty string i.e. current location
tb *telemetry.TelemetryBuffer
)

log.SetName(name)
Expand All @@ -168,84 +167,87 @@ func main() {

cniReport := reportManager.Report.(*telemetry.CNIReport)

upTime, err := platform.GetLastRebootTime()
if err == nil {
cniReport.VMUptime = upTime.Format("2006-01-02 15:04:05")
}

cniReport.GetReport(pluginName, version, ipamQueryURL)

netPlugin, err := network.NewPlugin(name, &config, &nns.GrpcClient{})
if err != nil {
log.Printf("Failed to create network plugin, err:%v.\n", err)
return
}

// CNI Acquires lock
if err = netPlugin.Plugin.InitializeKeyValueStore(&config); err != nil {
log.Errorf("Failed to initialize key-value store of network plugin, err:%v.\n", err)
tb := telemetry.NewTelemetryBuffer()
if tberr := tb.Connect(); tberr == nil {
reportPluginError(reportManager, tb, err)
tb.Close()
// Check CNI_COMMAND value
cniCmd := os.Getenv(cni.Cmd)

if cniCmd != cni.CmdVersion {
log.Printf("CNI_COMMAND environment variable set to %s", cniCmd)

cniReport.GetReport(pluginName, version, ipamQueryURL)

upTime, err := platform.GetLastRebootTime()
if err == nil {
cniReport.VMUptime = upTime.Format("2006-01-02 15:04:05")
}

if isSafe, _ := netPlugin.Plugin.IsSafeToRemoveLock(name); isSafe {
log.Printf("[CNI] Removing lock file as process holding lock exited")
if errUninit := netPlugin.Plugin.UninitializeKeyValueStore(true); errUninit != nil {
log.Errorf("Failed to uninitialize key-value store of network plugin, err:%v.\n", errUninit)
// CNI Acquires lock
if err = netPlugin.Plugin.InitializeKeyValueStore(&config); err != nil {
log.Errorf("Failed to initialize key-value store of network plugin, err:%v.\n", err)
tb := telemetry.NewTelemetryBuffer()
if tberr := tb.Connect(); tberr == nil {
reportPluginError(reportManager, tb, err)
tb.Close()
}
}

return
}
if isSafe, _ := netPlugin.Plugin.IsSafeToRemoveLock(name); isSafe {
log.Printf("[CNI] Removing lock file as process holding lock exited")
if errUninit := netPlugin.Plugin.UninitializeKeyValueStore(true); errUninit != nil {
log.Errorf("Failed to uninitialize key-value store of network plugin, err:%v.\n", errUninit)
}
}

defer func() {
if errUninit := netPlugin.Plugin.UninitializeKeyValueStore(false); errUninit != nil {
log.Errorf("Failed to uninitialize key-value store of network plugin, err:%v.\n", errUninit)
return
}

if recover() != nil {
os.Exit(1)
}
}()
defer func() {
if errUninit := netPlugin.Plugin.UninitializeKeyValueStore(false); errUninit != nil {
log.Errorf("Failed to uninitialize key-value store of network plugin, err:%v.\n", errUninit)
}

// Start telemetry process if not already started. This should be done inside lock, otherwise multiple process
// end up creating/killing telemetry process results in undesired state.
tb := telemetry.NewTelemetryBuffer()
tb.ConnectToTelemetryService(telemetryNumRetries, telemetryWaitTimeInMilliseconds)
defer tb.Close()
if recover() != nil {
os.Exit(1)
}
}()

netPlugin.SetCNIReport(cniReport, tb)
// Start telemetry process if not already started. This should be done inside lock, otherwise multiple process
// end up creating/killing telemetry process results in undesired state.
tb = telemetry.NewTelemetryBuffer()
tb.ConnectToTelemetryService(telemetryNumRetries, telemetryWaitTimeInMilliseconds)
defer tb.Close()

t := time.Now()
cniReport.Timestamp = t.Format("2006-01-02 15:04:05")
netPlugin.SetCNIReport(cniReport, tb)

if err = netPlugin.Start(&config); err != nil {
log.Errorf("Failed to start network plugin, err:%v.\n", err)
reportPluginError(reportManager, tb, err)
panic("network plugin start fatal error")
}
t := time.Now()
cniReport.Timestamp = t.Format("2006-01-02 15:04:05")

// Check CNI_COMMAND value for logging purposes.
cniCmd := os.Getenv(cni.Cmd)
log.Printf("CNI_COMMAND environment variable set to %s", cniCmd)

// used to dump state
if cniCmd == cni.CmdGetEndpointsState {
log.Printf("Retrieving state")
simpleState, err := netPlugin.GetAllEndpointState("azure")
if err != nil {
log.Errorf("Failed to get Azure CNI state, err:%v.\n", err)
return
if err = netPlugin.Start(&config); err != nil {
log.Errorf("Failed to start network plugin, err:%v.\n", err)
reportPluginError(reportManager, tb, err)
panic("network plugin start fatal error")
}

err = simpleState.PrintResult()
if err != nil {
log.Errorf("Failed to print state result to stdout with err %v\n", err)
}
// used to dump state
if cniCmd == cni.CmdGetEndpointsState {
log.Printf("Retrieving state")
simpleState, err := netPlugin.GetAllEndpointState("azure")
if err != nil {
log.Errorf("Failed to get Azure CNI state, err:%v.\n", err)
return
}

return
err = simpleState.PrintResult()
if err != nil {
log.Errorf("Failed to print state result to stdout with err %v\n", err)
}

return
}
}

handled, err := handleIfCniUpdate(netPlugin.Update)
Expand All @@ -255,6 +257,10 @@ func main() {
log.Errorf("Failed to execute network plugin, err:%v.\n", err)
}

if cniCmd == cni.CmdVersion {
return
}

netPlugin.Stop()

// release cni lock
Expand Down