Fix the dump and restore core race in case of -persistent flag enab…

…led (correct approach)
up9inc · Feb 9, 2022 · 54e90bc · 54e90bc
1 parent 53014c6
commit 54e90bc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/server/server.go b/server/server.go
@@ -179,10 +179,6 @@ func init() {
 		macros:         make(map[string]string),
 	}
 
-	// Trigger partitioning check for every second.
-	ticker := time.NewTicker(1 * time.Second)
-	go periodicPartitioner(ticker)
-
 	// Initiate the global watcher
 	var err error
 	watcher, err = fsnotify.NewWatcher()
@@ -199,8 +195,13 @@ func main() {
 	} else {
 		// Clean up the database files.
 		removeDatabaseFiles()
+		newPartition()
 	}
 
+	// Trigger partitioning check for every second.
+	ticker := time.NewTicker(1 * time.Second)
+	go periodicPartitioner(ticker)
+
 	// Print version and exit.
 	if *version {
 		fmt.Printf("%s\n", VERSION)

diff --git a/server/server_test.go b/server/server_test.go
@@ -624,6 +624,13 @@ func TestServerProtocolLimitMode(t *testing.T) {
 		partitionIndex: -1,
 	}
 
+	f := newPartition()
+	assert.NotNil(t, f)
+
+	// Trigger partitioning check for every second.
+	ticker := time.NewTicker(1 * time.Second)
+	go periodicPartitioner(ticker)
+
 	server, client := net.Pipe()
 	go handleConnection(server)