[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Fri Dec 8 20:48:02 UTC 2017
The branch, master has been updated
via b8d0602 selftest: Rework samba.dsdb locking test to samba.dsdb_lock
from 8cdb399 pthreadpool: Add test for pthread_create failure
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b8d0602e598a814b8e707b50aa895d18aa3d8d6c
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Dec 6 14:31:54 2017 +1300
selftest: Rework samba.dsdb locking test to samba.dsdb_lock
This avoids running the test while samba is modifying and locking the same database,
as this can lead to a deadlock.
The deadlock is not seen in production as the LDB read lock is not held while
waiting for another process, but this test needs to do this to demonstrate
the locking safety.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Fri Dec 8 21:47:55 CET 2017 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
python/samba/tests/dsdb.py | 358 ---------------------------
python/samba/tests/{dsdb.py => dsdb_lock.py} | 182 +-------------
python/samba/tests/samdb.py | 81 ++----
source4/selftest/tests.py | 1 +
4 files changed, 34 insertions(+), 588 deletions(-)
copy python/samba/tests/{dsdb.py => dsdb_lock.py} (58%)
Changeset truncated at 500 lines:
diff --git a/python/samba/tests/dsdb.py b/python/samba/tests/dsdb.py
index 493ea25..c740a41 100644
--- a/python/samba/tests/dsdb.py
+++ b/python/samba/tests/dsdb.py
@@ -26,10 +26,7 @@ from samba.ndr import ndr_unpack, ndr_pack
from samba.dcerpc import drsblobs
from samba import dsdb
import ldb
-import os
import samba
-import gc
-import time
class DsdbTests(TestCase):
@@ -166,361 +163,6 @@ class DsdbTests(TestCase):
self.samdb.set_attribute_replmetadata_version(dn, "description", version + 2)
self.assertEqual(self.samdb.get_attribute_replmetadata_version(dn, "description"), version + 2)
- def test_db_lock1(self):
- basedn = self.samdb.get_default_basedn()
- (r1, w1) = os.pipe()
-
- pid = os.fork()
- if pid == 0:
- # In the child, close the main DB, re-open just one DB
- del(self.samdb)
- gc.collect()
- self.samdb = SamDB(session_info=self.session,
- credentials=self.creds,
- lp=self.lp)
-
- self.samdb.transaction_start()
-
- dn = "cn=test_db_lock_user,cn=users," + str(basedn)
- self.samdb.add({
- "dn": dn,
- "objectclass": "user",
- })
- self.samdb.delete(dn)
-
- # Obtain a write lock
- self.samdb.transaction_prepare_commit()
- os.write(w1, b"prepared")
- time.sleep(2)
-
- # Drop the write lock
- self.samdb.transaction_cancel()
- os._exit(0)
-
- self.assertEqual(os.read(r1, 8), b"prepared")
-
- start = time.time()
-
- # We need to hold this iterator open to hold the all-record lock.
- res = self.samdb.search_iterator()
-
- # This should take at least 2 seconds because the transaction
- # has a write lock on one backend db open
-
- # Release the locks
- for l in res:
- pass
-
- end = time.time()
- self.assertGreater(end - start, 1.9)
-
- (got_pid, status) = os.waitpid(pid, 0)
- self.assertEqual(got_pid, pid)
- self.assertTrue(os.WIFEXITED(status))
- self.assertEqual(os.WEXITSTATUS(status), 0)
-
- def test_db_lock2(self):
- basedn = self.samdb.get_default_basedn()
- (r1, w1) = os.pipe()
- (r2, w2) = os.pipe()
-
- pid = os.fork()
- if pid == 0:
- # In the child, close the main DB, re-open
- del(self.samdb)
- gc.collect()
- self.samdb = SamDB(session_info=self.session,
- credentials=self.creds,
- lp=self.lp)
-
- # We need to hold this iterator open to hold the all-record lock.
- res = self.samdb.search_iterator()
-
- os.write(w2, b"start")
- if (os.read(r1, 7) != b"started"):
- os._exit(1)
-
- os.write(w2, b"add")
- if (os.read(r1, 5) != b"added"):
- os._exit(2)
-
- # Wait 2 seconds to block prepare_commit() in the child.
- os.write(w2, b"prepare")
- time.sleep(2)
-
- # Release the locks
- for l in res:
- pass
-
- if (os.read(r1, 8) != b"prepared"):
- os._exit(3)
-
- os._exit(0)
-
- # We can start the transaction during the search
- # because both just grab the all-record read lock.
- self.assertEqual(os.read(r2, 5), b"start")
- self.samdb.transaction_start()
- os.write(w1, b"started")
-
- self.assertEqual(os.read(r2, 3), b"add")
- dn = "cn=test_db_lock_user,cn=users," + str(basedn)
- self.samdb.add({
- "dn": dn,
- "objectclass": "user",
- })
- self.samdb.delete(dn)
- os.write(w1, b"added")
-
- # Obtain a write lock, this will block until
- # the parent releases the read lock.
- self.assertEqual(os.read(r2, 7), b"prepare")
- start = time.time()
- self.samdb.transaction_prepare_commit()
- end = time.time()
- try:
- self.assertGreater(end - start, 1.9)
- except:
- raise
- finally:
- os.write(w1, b"prepared")
-
- # Drop the write lock
- self.samdb.transaction_cancel()
-
- (got_pid, status) = os.waitpid(pid, 0)
- self.assertEqual(got_pid, pid)
- self.assertTrue(os.WIFEXITED(status))
- self.assertEqual(os.WEXITSTATUS(status), 0)
-
- def test_db_lock3(self):
- basedn = self.samdb.get_default_basedn()
- (r1, w1) = os.pipe()
- (r2, w2) = os.pipe()
-
- pid = os.fork()
- if pid == 0:
- # In the child, close the main DB, re-open
- del(self.samdb)
- gc.collect()
- self.samdb = SamDB(session_info=self.session,
- credentials=self.creds,
- lp=self.lp)
-
- # We need to hold this iterator open to hold the all-record lock.
- res = self.samdb.search_iterator()
-
- os.write(w2, b"start")
- if (os.read(r1, 7) != b"started"):
- os._exit(1)
-
- os.write(w2, b"add")
- if (os.read(r1, 5) != b"added"):
- os._exit(2)
-
- # Wait 2 seconds to block prepare_commit() in the child.
- os.write(w2, b"prepare")
- time.sleep(2)
-
- # Release the locks
- for l in res:
- pass
-
- if (os.read(r1, 8) != b"prepared"):
- os._exit(3)
-
- os._exit(0)
-
- # We can start the transaction during the search
- # because both just grab the all-record read lock.
- self.assertEqual(os.read(r2, 5), b"start")
- self.samdb.transaction_start()
- os.write(w1, b"started")
-
- self.assertEqual(os.read(r2, 3), b"add")
-
- # This will end up in the top level db
- dn = "@DSDB_LOCK_TEST"
- self.samdb.add({
- "dn": dn})
- self.samdb.delete(dn)
- os.write(w1, b"added")
-
- # Obtain a write lock, this will block until
- # the child releases the read lock.
- self.assertEqual(os.read(r2, 7), b"prepare")
- start = time.time()
- self.samdb.transaction_prepare_commit()
- end = time.time()
- self.assertGreater(end - start, 1.9)
- os.write(w1, b"prepared")
-
- # Drop the write lock
- self.samdb.transaction_cancel()
-
- (got_pid, status) = os.waitpid(pid, 0)
- self.assertTrue(os.WIFEXITED(status))
- self.assertEqual(os.WEXITSTATUS(status), 0)
- self.assertEqual(got_pid, pid)
-
-
- def _test_full_db_lock1(self, backend_path):
- (r1, w1) = os.pipe()
-
- pid = os.fork()
- if pid == 0:
- # In the child, close the main DB, re-open just one DB
- del(self.samdb)
- gc.collect()
-
- backenddb = ldb.Ldb(backend_path)
-
-
- backenddb.transaction_start()
-
- backenddb.add({"dn":"@DSDB_LOCK_TEST"})
- backenddb.delete("@DSDB_LOCK_TEST")
-
- # Obtain a write lock
- backenddb.transaction_prepare_commit()
- os.write(w1, b"prepared")
- time.sleep(2)
-
- # Drop the write lock
- backenddb.transaction_cancel()
- os._exit(0)
-
- self.assertEqual(os.read(r1, 8), b"prepared")
-
- start = time.time()
-
- # We need to hold this iterator open to hold the all-record lock.
- res = self.samdb.search_iterator()
-
- # This should take at least 2 seconds because the transaction
- # has a write lock on one backend db open
-
- end = time.time()
- self.assertGreater(end - start, 1.9)
-
- # Release the locks
- for l in res:
- pass
-
- (got_pid, status) = os.waitpid(pid, 0)
- self.assertEqual(got_pid, pid)
- self.assertTrue(os.WIFEXITED(status))
- self.assertEqual(os.WEXITSTATUS(status), 0)
-
- def test_full_db_lock1(self):
- basedn = self.samdb.get_default_basedn()
- backend_filename = "%s.ldb" % basedn.get_casefold()
- backend_subpath = os.path.join("sam.ldb.d",
- backend_filename)
- backend_path = self.lp.private_path(backend_subpath)
- self._test_full_db_lock1(backend_path)
-
-
- def test_full_db_lock1_config(self):
- basedn = self.samdb.get_config_basedn()
- backend_filename = "%s.ldb" % basedn.get_casefold()
- backend_subpath = os.path.join("sam.ldb.d",
- backend_filename)
- backend_path = self.lp.private_path(backend_subpath)
- self._test_full_db_lock1(backend_path)
-
-
- def _test_full_db_lock2(self, backend_path):
- (r1, w1) = os.pipe()
- (r2, w2) = os.pipe()
-
- pid = os.fork()
- if pid == 0:
-
- # In the child, close the main DB, re-open
- del(self.samdb)
- gc.collect()
- self.samdb = SamDB(session_info=self.session,
- credentials=self.creds,
- lp=self.lp)
-
- # We need to hold this iterator open to hold the all-record lock.
- res = self.samdb.search_iterator()
-
- os.write(w2, b"start")
- if (os.read(r1, 7) != b"started"):
- os._exit(1)
- os.write(w2, b"add")
- if (os.read(r1, 5) != b"added"):
- os._exit(2)
-
- # Wait 2 seconds to block prepare_commit() in the child.
- os.write(w2, b"prepare")
- time.sleep(2)
-
- # Release the locks
- for l in res:
- pass
-
- if (os.read(r1, 8) != b"prepared"):
- os._exit(3)
-
- os._exit(0)
-
- # In the parent, close the main DB, re-open just one DB
- del(self.samdb)
- gc.collect()
- backenddb = ldb.Ldb(backend_path)
-
- # We can start the transaction during the search
- # because both just grab the all-record read lock.
- self.assertEqual(os.read(r2, 5), b"start")
- backenddb.transaction_start()
- os.write(w1, b"started")
-
- self.assertEqual(os.read(r2, 3), b"add")
- backenddb.add({"dn":"@DSDB_LOCK_TEST"})
- backenddb.delete("@DSDB_LOCK_TEST")
- os.write(w1, b"added")
-
- # Obtain a write lock, this will block until
- # the child releases the read lock.
- self.assertEqual(os.read(r2, 7), b"prepare")
- start = time.time()
- backenddb.transaction_prepare_commit()
- end = time.time()
-
- try:
- self.assertGreater(end - start, 1.9)
- except:
- raise
- finally:
- os.write(w1, b"prepared")
-
- # Drop the write lock
- backenddb.transaction_cancel()
-
- (got_pid, status) = os.waitpid(pid, 0)
- self.assertEqual(got_pid, pid)
- self.assertTrue(os.WIFEXITED(status))
- self.assertEqual(os.WEXITSTATUS(status), 0)
-
- def test_full_db_lock2(self):
- basedn = self.samdb.get_default_basedn()
- backend_filename = "%s.ldb" % basedn.get_casefold()
- backend_subpath = os.path.join("sam.ldb.d",
- backend_filename)
- backend_path = self.lp.private_path(backend_subpath)
- self._test_full_db_lock2(backend_path)
-
- def test_full_db_lock2_config(self):
- basedn = self.samdb.get_config_basedn()
- backend_filename = "%s.ldb" % basedn.get_casefold()
- backend_subpath = os.path.join("sam.ldb.d",
- backend_filename)
- backend_path = self.lp.private_path(backend_subpath)
- self._test_full_db_lock2(backend_path)
-
def test_no_error_on_invalid_control(self):
try:
res = self.samdb.search(scope=ldb.SCOPE_SUBTREE,
diff --git a/python/samba/tests/dsdb.py b/python/samba/tests/dsdb_lock.py
similarity index 58%
copy from python/samba/tests/dsdb.py
copy to python/samba/tests/dsdb_lock.py
index 493ea25..9cc93aa 100644
--- a/python/samba/tests/dsdb.py
+++ b/python/samba/tests/dsdb_lock.py
@@ -1,5 +1,5 @@
-# Unix SMB/CIFS implementation. Tests for dsdb
-# Copyright (C) Matthieu Patou <mat at matws.net> 2010
+# Unix SMB/CIFS implementation. Tests for SamDB
+# Copyright (C) Jelmer Vernooij <jelmer at samba.org> 2008
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -15,157 +15,17 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-"""Tests for samba.dsdb."""
+"""Tests for samba's dsdb modules"""
-from samba.credentials import Credentials
+from samba.tests.samdb import SamDBTestCase
from samba.samdb import SamDB
-from samba.auth import system_session
-from samba.tests import TestCase
-from samba.tests import delete_force
-from samba.ndr import ndr_unpack, ndr_pack
-from samba.dcerpc import drsblobs
-from samba import dsdb
import ldb
import os
import samba
import gc
import time
-class DsdbTests(TestCase):
-
- def setUp(self):
- super(DsdbTests, self).setUp()
- self.lp = samba.tests.env_loadparm()
- self.creds = Credentials()
- self.creds.guess(self.lp)
- self.session = system_session()
- self.samdb = SamDB(session_info=self.session,
- credentials=self.creds,
- lp=self.lp)
-
- # Create a test user
- user_name = "samdb-testuser"
- user_pass = samba.generate_random_password(32, 32)
- user_description = "Test user for dsdb test"
-
- base_dn = self.samdb.domain_dn()
-
- self.account_dn = "cn=" + user_name + ",cn=Users," + base_dn
- delete_force(self.samdb, self.account_dn)
- self.samdb.newuser(username=user_name,
- password=user_pass,
- description=user_description)
-
- def test_get_oid_from_attrid(self):
- oid = self.samdb.get_oid_from_attid(591614)
- self.assertEquals(oid, "1.2.840.113556.1.4.1790")
-
- def test_error_replpropertymetadata(self):
- res = self.samdb.search(scope=ldb.SCOPE_SUBTREE,
- base=self.account_dn,
- attrs=["replPropertyMetaData"])
- repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob,
- str(res[0]["replPropertyMetaData"]))
- ctr = repl.ctr
- for o in ctr.array:
- # Search for Description
- if o.attid == 13:
- old_version = o.version
- o.version = o.version + 1
- replBlob = ndr_pack(repl)
- msg = ldb.Message()
- msg.dn = res[0].dn
- msg["replPropertyMetaData"] = ldb.MessageElement(replBlob, ldb.FLAG_MOD_REPLACE, "replPropertyMetaData")
- self.assertRaises(ldb.LdbError, self.samdb.modify, msg, ["local_oid:1.3.6.1.4.1.7165.4.3.14:0"])
-
- def test_error_replpropertymetadata_nochange(self):
- res = self.samdb.search(scope=ldb.SCOPE_SUBTREE,
- base=self.account_dn,
- attrs=["replPropertyMetaData"])
- repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob,
- str(res[0]["replPropertyMetaData"]))
- replBlob = ndr_pack(repl)
- msg = ldb.Message()
- msg.dn = res[0].dn
- msg["replPropertyMetaData"] = ldb.MessageElement(replBlob, ldb.FLAG_MOD_REPLACE, "replPropertyMetaData")
- self.assertRaises(ldb.LdbError, self.samdb.modify, msg, ["local_oid:1.3.6.1.4.1.7165.4.3.14:0"])
-
- def test_error_replpropertymetadata_allow_sort(self):
- res = self.samdb.search(scope=ldb.SCOPE_SUBTREE,
- base=self.account_dn,
- attrs=["replPropertyMetaData"])
- repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob,
- str(res[0]["replPropertyMetaData"]))
- replBlob = ndr_pack(repl)
- msg = ldb.Message()
- msg.dn = res[0].dn
- msg["replPropertyMetaData"] = ldb.MessageElement(replBlob, ldb.FLAG_MOD_REPLACE, "replPropertyMetaData")
- self.samdb.modify(msg, ["local_oid:1.3.6.1.4.1.7165.4.3.14:0", "local_oid:1.3.6.1.4.1.7165.4.3.25:0"])
-
- def test_twoatt_replpropertymetadata(self):
- res = self.samdb.search(scope=ldb.SCOPE_SUBTREE,
- base=self.account_dn,
- attrs=["replPropertyMetaData", "uSNChanged"])
- repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob,
- str(res[0]["replPropertyMetaData"]))
- ctr = repl.ctr
- for o in ctr.array:
- # Search for Description
- if o.attid == 13:
- old_version = o.version
- o.version = o.version + 1
- o.local_usn = long(str(res[0]["uSNChanged"])) + 1
- replBlob = ndr_pack(repl)
- msg = ldb.Message()
--
Samba Shared Repository
More information about the samba-cvs
mailing list