Close the control socket during cleanup

This should prevent further requests coming in, triggering deadlocks.

src/server/serve.c

@@ -827,6 +827,11 @@ void serve_cleanup(struct server *params,
 	close(params->server_fd);
     }
 
+    /* close the control socket too */
+    if (params->flexnbd && params->flexnbd->control) {
+        control_signal_close(params->flexnbd->control);
+    }
+
     /* need to stop background build if we're killed very early on */
     pthread_cancel(params->allocation_map_builder_thread);
     pthread_join(params->allocation_map_builder_thread, &status);
@@ -861,15 +866,6 @@ void serve_cleanup(struct server *params,
 	server_unlock_acl(params);
     }
 
-    /* if( params->flexnbd ) { */
-    /*      if ( params->flexnbd->control ) { */
-    /*              flexnbd_stop_control( params->flexnbd ); */
-    /*      } */
-    /*      flexnbd_destroy( params->flexnbd ); */
-    /* } */
-
-    /* server_destroy( params ); */
-
     debug("Cleanup done");
 }
 

tests/acceptance/test_write_during_migration.rb

@@ -114,7 +114,7 @@ class TestWriteDuringMigration < Test::Unit::TestCase
           sock.flush
           sock.readline
         end
-      rescue Errno::ENOENT
+      rescue StandardError
         # If the socket disappears, that's OK.
         break
       end