Skip to content
This repository has been archived by the owner on Jun 20, 2024. It is now read-only.

Commit

Permalink
Add random nonce to test ipset name to prevent race
Browse files Browse the repository at this point in the history
As ipset.New(...) can be called by two processes (weaver and weave-npc)
at the same time, there is a possibility for a race when they both
check the comment support. To prevent the race, we append a random
nonce to the test ipset name.
  • Loading branch information
brb committed Jun 4, 2018
1 parent b6115f0 commit 4c13639
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion net/ipset/ipset.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package ipset

import (
"crypto/rand"
"encoding/hex"
"fmt"
"log"
"os/exec"
"strings"
Expand Down Expand Up @@ -56,7 +59,13 @@ func New(logger *log.Logger) Interface {
}

// Check for comment support
testIpsetName := Name("weave-test-comment")

// To prevent from a race when more than one process check for the support
// we append a random nonce to the test ipset name.
nonce := make([]byte, 4)
rand.Read(nonce)
testIpsetName := Name("weave-test-comment" + hex.EncodeToString(nonce))

// Clear it out if it already exists
_ = ips.Destroy(testIpsetName)
// Test for comment support
Expand Down

0 comments on commit 4c13639

Please sign in to comment.