[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  da9472a934b prefork tests: re-enable restart tests for MIT Kerberos
       via  1c4b9ba36c7 prefork restart tests: Use echo server for back off
       via  15196c7561f s4 echo_server: Enable prefork process model
      from  5522aa1a4c3 vfs:glusterfs_fuse: ensure fileids are constant across nodes

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit da9472a934bf242c7dec1a7a355fb4eb043e5b15
Author: Gary Lockyer <gary at catalyst.net.nz>
Date:   Thu Jul 11 09:31:31 2019 +1200

    prefork tests: re-enable restart tests for MIT Kerberos
    
    Previously the restart back off tests were disabled for MIT Kerberos, as
    they used the kdc, which is not run in that case.  Tests now use the
    echo server.
    
    Signed-off-by: Gary Lockyer <gary at catalyst.net.nz>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Tue Jul 16 10:10:23 UTC 2019 on sn-devel-184

commit 1c4b9ba36c724b6fcc26a51af5202483ab3f1c23
Author: Gary Lockyer <gary at catalyst.net.nz>
Date:   Thu Jul 11 09:28:30 2019 +1200

    prefork restart tests: Use echo server for back off
    
    Use the echo server for the restart back off tests in the
    samba.tests.prefork_restart tests instead of the kdc.  The kdc is not enabled
    when the ADDC is built to run MIT Kerberos.  Changing the test to use
    the echo server means it can be run when MIT Kerberos is enabled.
    
    Signed-off-by: Gary Lockyer <gary at catalyst.net.nz>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit 15196c7561ff3afdb3d61afd6951d22e4cf698c7
Author: Gary Lockyer <gary at catalyst.net.nz>
Date:   Thu Jul 11 09:29:28 2019 +1200

    s4 echo_server: Enable prefork process model
    
    Enable the prefork process model, for the echo server.  This is allows
    it to be used in the prefork_restart tests.
    
    Signed-off-by: Gary Lockyer <gary at catalyst.net.nz>
    Reviewed-by: Andreas Schneider <asn at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 python/samba/tests/prefork_restart.py | 14 +++++++-------
 selftest/skip_mit_kdc                 |  4 ----
 source4/echo_server/echo_server.c     |  2 +-
 3 files changed, 8 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/tests/prefork_restart.py b/python/samba/tests/prefork_restart.py
index 5233ca1f805..9ab97d062b4 100644
--- a/python/samba/tests/prefork_restart.py
+++ b/python/samba/tests/prefork_restart.py
@@ -404,7 +404,7 @@ class PreforkProcessRestartTests(TestCase):
     def test_master_restart_backoff(self):
 
         # get kdc master process
-        pid = self.get_process("prefork-master-kdc")
+        pid = self.get_process("prefork-master-echo")
         self.assertIsNotNone(pid)
 
         #
@@ -417,13 +417,13 @@ class PreforkProcessRestartTests(TestCase):
             # Get the worker processes
             workers = self.get_worker_pids("kdc", NUM_WORKERS)
 
-            process = self.get_process("prefork-master-kdc")
+            process = self.get_process("prefork-master-echo")
             os.kill(process, signal.SIGTERM)
             # wait for the process to restart
             start = time.time()
-            self.wait_for_process("prefork-master-kdc", process, 0, 1, 30)
+            self.wait_for_process("prefork-master-echo", process, 0, 1, 30)
             # wait for the workers to restart as well
-            self.wait_for_workers("kdc", workers)
+            self.wait_for_workers("echo", workers)
             end = time.time()
             duration = end - start
 
@@ -434,7 +434,7 @@ class PreforkProcessRestartTests(TestCase):
             self.assertGreaterEqual(duration, expected)
 
         # check that the worker processes have restarted
-        new_workers = self.get_worker_pids("kdc", NUM_WORKERS)
+        new_workers = self.get_worker_pids("echo", NUM_WORKERS)
         for x in range(NUM_WORKERS):
             self.assertNotEquals(workers[x], new_workers[x])
 
@@ -449,12 +449,12 @@ class PreforkProcessRestartTests(TestCase):
         #      prefork maximum backoff   = 10
         backoff_increment = 5
         for expected in [0, 5, 10, 10]:
-            process = self.get_process("prefork-worker-kdc-2")
+            process = self.get_process("prefork-worker-echo-2")
             self.assertIsNotNone(process)
             os.kill(process, signal.SIGTERM)
             # wait for the process to restart
             start = time.time()
-            self.wait_for_process("prefork-worker-kdc-2", process, 0, 1, 30)
+            self.wait_for_process("prefork-worker-echo-2", process, 0, 1, 30)
             end = time.time()
             duration = end - start
 
diff --git a/selftest/skip_mit_kdc b/selftest/skip_mit_kdc
index bef52f50f86..4a51c98ea0b 100644
--- a/selftest/skip_mit_kdc
+++ b/selftest/skip_mit_kdc
@@ -3,7 +3,3 @@
 .*RODC
 ^samba4.ntvfs.cifs.ntlm.base.unlink
 ^samba4.ntvfs.cifs.krb5.base.unlink
-#
-# We skip the pre-fork restart tests as they use the kdc process to test
-# restart back off
-^samba.tests.prefork_restart
diff --git a/source4/echo_server/echo_server.c b/source4/echo_server/echo_server.c
index f38999ae139..c81fc140a0a 100644
--- a/source4/echo_server/echo_server.c
+++ b/source4/echo_server/echo_server.c
@@ -327,7 +327,7 @@ NTSTATUS server_service_echo_init(TALLOC_CTX *ctx)
 {
 	static const struct service_details details = {
 		.inhibit_fork_on_accept = true,
-		.inhibit_pre_fork = true,
+		.inhibit_pre_fork = false,
 		.task_init = echo_task_init,
 		.post_fork = NULL
 


-- 
Samba Shared Repository