Prevent Peer Queue Close from being called more than Once on Shutdown

event/eventQueue.go

@@ -48,8 +48,10 @@ func (iq *queue) Len() int {
 // Shutdown closes our eventChannel
 func (iq *queue) Shutdown() {
 	iq.lock.Lock()
-	iq.closed = true
-	iq.infChan.Close()
+	if !iq.closed {
+		iq.closed = true
+		iq.infChan.Close()
+	}
 	iq.lock.Unlock()
 
 }

peer/cwtch_peer.go

@@ -1035,10 +1035,13 @@ func (cp *cwtchPeer) StartServerConnections() {
 func (cp *cwtchPeer) Shutdown() {
 	cp.mutex.Lock()
 	defer cp.mutex.Unlock()
-	cp.shutdown = true
-	cp.queue.Shutdown()
-	if cp.storage != nil {
-		cp.storage.Close(true)
+	// don't allow this to be shutdown twice...
+	if !cp.shutdown {
+		cp.shutdown = true
+		cp.queue.Shutdown()
+		if cp.storage != nil {
+			cp.storage.Close(true)
+		}
 	}
 }
 

testing/cwtch_peer_server_integration_test.go

@@ -394,7 +394,7 @@ func TestCwtchPeerIntegration(t *testing.T) {
 	pprof.Lookup("goroutine").WriteTo(os.Stdout, 1)
 
 	log.Infof("numGoRoutinesStart: %v\nnumGoRoutinesPostAppStart: %v\nnumGoRoutinesPostPeerStart: %v\nnumGoRoutinesPostPeerAndServerConnect: %v\n"+
-	    "numGoRoutinesPostAlice: %v\nnumGoRoutinesPostCarolConnect: %v\nnumGoRoutinesPostBob: %v\nnumGoRoutinesPostCarol: %v\nnumGoRoutinesPostAppShutdown: %v",
+		"numGoRoutinesPostAlice: %v\nnumGoRoutinesPostCarolConnect: %v\nnumGoRoutinesPostBob: %v\nnumGoRoutinesPostCarol: %v\nnumGoRoutinesPostAppShutdown: %v",
 		numGoRoutinesStart, numGoRoutinesPostAppStart, numGoRoutinesPostPeerStart, numGoRoutinesPostServerConnect,
 		numGoRoutinesPostAlice, numGoRoutinesPostCarolConnect, numGoRoutinesPostBob, numGoRoutinesPostCarol, numGoRoutinesPostAppShutdown)
 

testing/filesharing/file_sharing_integration_test.go

@@ -157,6 +157,9 @@ func TestFileSharing(t *testing.T) {
 	// run the same download test again...to check that we can actually download the file
 	testBobDownloadFile(t, bob, filesharingFunctionality, queueOracle)
 
+	// test that we can delete bob...
+	app.DeletePeer(bob.GetOnion(), "asdfasdf")
+
 	queueOracle.Shutdown()
 	app.Shutdown()
 	acn.Close()