October 2015 - calendarserver-changes

[15262] CalendarServer/trunk/requirements-cs.txt
by source_changes＠macosforge.org 30 Oct '15

30 Oct '15

Revision: 15262 http://trac.calendarserver.org//changeset/15262 Author: cdaboo(a)apple.com Date: 2015-10-30 14:01:06 -0700 (Fri, 30 Oct 2015) Log Message: ----------- Latest twext. Modified Paths: -------------- CalendarServer/trunk/requirements-cs.txt Modified: CalendarServer/trunk/requirements-cs.txt =================================================================== --- CalendarServer/trunk/requirements-cs.txt 2015-10-30 20:59:03 UTC (rev 15261) +++ CalendarServer/trunk/requirements-cs.txt 2015-10-30 21:01:06 UTC (rev 15262) @@ -7,7 +7,7 @@ zope.interface==4.1.2 setuptools==17.0 - --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@152… + --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@152… cffi==1.1.0 pycparser==2.13 #twisted

1 0

[15261] twext/trunk/twext/internet/ssl.py
by source_changes＠macosforge.org 30 Oct '15

30 Oct '15

Revision: 15261 http://trac.calendarserver.org//changeset/15261 Author: cdaboo(a)apple.com Date: 2015-10-30 13:59:03 -0700 (Fri, 30 Oct 2015) Log Message: ----------- Fix for client-side openssl use. Modified Paths: -------------- twext/trunk/twext/internet/ssl.py Modified: twext/trunk/twext/internet/ssl.py =================================================================== --- twext/trunk/twext/internet/ssl.py 2015-10-30 17:46:20 UTC (rev 15260) +++ twext/trunk/twext/internet/ssl.py 2015-10-30 20:59:03 UTC (rev 15261) @@ -83,9 +83,10 @@ if self.keychainIdentity and hasattr(ctx, "use_keychain_identity"): ctx.use_keychain_identity(self.keychainIdentity) else: - ctx.use_certificate_file(self.certificateFileName) - ctx.use_privatekey_file(self.privateKeyFileName) - + if self.certificateFileName: + ctx.use_certificate_file(self.certificateFileName) + if self.privateKeyFileName: + ctx.use_privatekey_file(self.privateKeyFileName) if self.certificateChainFile: ctx.use_certificate_chain_file(self.certificateChainFile)

1 0

[15260] twext/trunk/setup.py
by source_changes＠macosforge.org 30 Oct '15

30 Oct '15

Revision: 15260 http://trac.calendarserver.org//changeset/15260 Author: cdaboo(a)apple.com Date: 2015-10-30 10:46:20 -0700 (Fri, 30 Oct 2015) Log Message: ----------- Only include cx_Oracle as an extra when we know the $ORACLE_HOME env var is defined. Modified Paths: -------------- twext/trunk/setup.py Modified: twext/trunk/setup.py =================================================================== --- twext/trunk/setup.py 2015-10-30 17:43:42 UTC (rev 15259) +++ twext/trunk/setup.py 2015-10-30 17:46:20 UTC (rev 15260) @@ -253,15 +253,15 @@ # OpenDirectory "OpenDirectory": ["pyobjc-framework-OpenDirectory"], - # Oracle - "Oracle": ["cx_Oracle"], - # Postgres "Postgres": [], } +if "ORACLE_HOME" in os.environ: + extras_requirements["Oracle"] = ["cx_Oracle"] + # # Set up Extension modules that need to be built #

1 0

[15259] CalendarServer/trunk/requirements-cs.txt
by source_changes＠macosforge.org 30 Oct '15

30 Oct '15

Revision: 15259 http://trac.calendarserver.org//changeset/15259 Author: cdaboo(a)apple.com Date: 2015-10-30 10:43:42 -0700 (Fri, 30 Oct 2015) Log Message: ----------- Latest twext. Modified Paths: -------------- CalendarServer/trunk/requirements-cs.txt Modified: CalendarServer/trunk/requirements-cs.txt =================================================================== --- CalendarServer/trunk/requirements-cs.txt 2015-10-30 17:43:20 UTC (rev 15258) +++ CalendarServer/trunk/requirements-cs.txt 2015-10-30 17:43:42 UTC (rev 15259) @@ -7,7 +7,7 @@ zope.interface==4.1.2 setuptools==17.0 - --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@152… + --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@152… cffi==1.1.0 pycparser==2.13 #twisted

1 0

[15258] twext/trunk/twext/python/test/test_launchd.py
by source_changes＠macosforge.org 30 Oct '15

30 Oct '15

Revision: 15258 http://trac.calendarserver.org//changeset/15258 Author: cdaboo(a)apple.com Date: 2015-10-30 10:43:20 -0700 (Fri, 30 Oct 2015) Log Message: ----------- Another launchd fix attempt. Modified Paths: -------------- twext/trunk/twext/python/test/test_launchd.py Modified: twext/trunk/twext/python/test/test_launchd.py =================================================================== --- twext/trunk/twext/python/test/test_launchd.py 2015-10-30 16:13:37 UTC (rev 15257) +++ twext/trunk/twext/python/test/test_launchd.py 2015-10-30 17:43:20 UTC (rev 15258) @@ -95,7 +95,7 @@ self.job = fp.child("job.plist") self.job.setContent(plistlib.writePlistToString(plist)) err = os.spawnlp(os.P_WAIT, "launchctl", "launchctl", "load", self.job.path) - if err == 127: + if err != 0 or os.path.exists(self.stderr.path): # This happens when running in headless mode (e.g., buildbot) and is due to # permission restrictions. Just skip the test. raise SkipTest("launchctl cannot run on this system")

1 0

[15257] CalendarServer/trunk/setup.py
by source_changes＠macosforge.org 30 Oct '15

30 Oct '15

Revision: 15257 http://trac.calendarserver.org//changeset/15257 Author: cdaboo(a)apple.com Date: 2015-10-30 09:13:37 -0700 (Fri, 30 Oct 2015) Log Message: ----------- Only include cx_Oracle as an extra when we know the $ORACLE_HOME env var is defined. Modified Paths: -------------- CalendarServer/trunk/setup.py Modified: CalendarServer/trunk/setup.py =================================================================== --- CalendarServer/trunk/setup.py 2015-10-30 15:16:00 UTC (rev 15256) +++ CalendarServer/trunk/setup.py 2015-10-30 16:13:37 UTC (rev 15257) @@ -358,10 +358,11 @@ extras_requirements = { "LDAP": ["twextpy[LDAP]"], "OpenDirectory": ["twextpy[OpenDirectory]"], - "Oracle": ["twextpy[Oracle]", "cx_Oracle"], "Postgres": ["twextpy[Postgres]", "pg8000"], } +if "ORACLE_HOME" in os.environ: + extras_requirements["Oracle"] = ["twextpy[Oracle]", "cx_Oracle"] #

1 0

[15256] CalendarServer/trunk/requirements-cs.txt
by source_changes＠macosforge.org 30 Oct '15

30 Oct '15

Revision: 15256 http://trac.calendarserver.org//changeset/15256 Author: cdaboo(a)apple.com Date: 2015-10-30 08:16:00 -0700 (Fri, 30 Oct 2015) Log Message: ----------- Latest twext. Modified Paths: -------------- CalendarServer/trunk/requirements-cs.txt Modified: CalendarServer/trunk/requirements-cs.txt =================================================================== --- CalendarServer/trunk/requirements-cs.txt 2015-10-30 15:15:42 UTC (rev 15255) +++ CalendarServer/trunk/requirements-cs.txt 2015-10-30 15:16:00 UTC (rev 15256) @@ -7,7 +7,7 @@ zope.interface==4.1.2 setuptools==17.0 - --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@152… + --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@152… cffi==1.1.0 pycparser==2.13 #twisted

1 0

[15255] twext/trunk/twext/python/test/test_launchd.py
by source_changes＠macosforge.org 30 Oct '15

30 Oct '15

Revision: 15255 http://trac.calendarserver.org//changeset/15255 Author: cdaboo(a)apple.com Date: 2015-10-30 08:15:42 -0700 (Fri, 30 Oct 2015) Log Message: ----------- Fix for headless/buildbot test runs. Modified Paths: -------------- twext/trunk/twext/python/test/test_launchd.py Modified: twext/trunk/twext/python/test/test_launchd.py =================================================================== --- twext/trunk/twext/python/test/test_launchd.py 2015-10-30 14:40:40 UTC (rev 15254) +++ twext/trunk/twext/python/test/test_launchd.py 2015-10-30 15:15:42 UTC (rev 15255) @@ -48,7 +48,7 @@ else: skip = False -from twisted.trial.unittest import TestCase +from twisted.trial.unittest import TestCase, SkipTest from twisted.python.filepath import FilePath @@ -94,7 +94,12 @@ } self.job = fp.child("job.plist") self.job.setContent(plistlib.writePlistToString(plist)) - os.spawnlp(os.P_WAIT, "launchctl", "launchctl", "load", self.job.path) + err = os.spawnlp(os.P_WAIT, "launchctl", "launchctl", "load", self.job.path) + if err == 127: + # This happens when running in headless mode (e.g., buildbot) and is due to + # permission restrictions. Just skip the test. + raise SkipTest("launchctl cannot run on this system") + return d

1 0

[15254] CalendarServer/trunk/requirements-cs.txt
by source_changes＠macosforge.org 30 Oct '15

30 Oct '15

Revision: 15254 http://trac.calendarserver.org//changeset/15254 Author: cdaboo(a)apple.com Date: 2015-10-30 07:40:40 -0700 (Fri, 30 Oct 2015) Log Message: ----------- Latest twext. Modified Paths: -------------- CalendarServer/trunk/requirements-cs.txt Modified: CalendarServer/trunk/requirements-cs.txt =================================================================== --- CalendarServer/trunk/requirements-cs.txt 2015-10-30 14:40:20 UTC (rev 15253) +++ CalendarServer/trunk/requirements-cs.txt 2015-10-30 14:40:40 UTC (rev 15254) @@ -7,7 +7,7 @@ zope.interface==4.1.2 setuptools==17.0 - --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@152… + --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@152… cffi==1.1.0 pycparser==2.13 #twisted

1 0

[15253] twext/trunk/twext
by source_changes＠macosforge.org 30 Oct '15

30 Oct '15

Revision: 15253 http://trac.calendarserver.org//changeset/15253 Author: cdaboo(a)apple.com Date: 2015-10-30 07:40:20 -0700 (Fri, 30 Oct 2015) Log Message: ----------- M<erge thread deadlock fix from PyPy branch to trunk. Modified Paths: -------------- twext/trunk/twext/enterprise/adbapi2.py twext/trunk/twext/enterprise/fixtures.py twext/trunk/twext/enterprise/jobs/test/test_jobs.py twext/trunk/twext/internet/threadutils.py Modified: twext/trunk/twext/enterprise/adbapi2.py =================================================================== --- twext/trunk/twext/enterprise/adbapi2.py 2015-10-29 19:04:13 UTC (rev 15252) +++ twext/trunk/twext/enterprise/adbapi2.py 2015-10-30 14:40:20 UTC (rev 15253) @@ -751,6 +751,7 @@ """ spooledBase = self._baseTxn self._baseTxn = baseTxn + self._baseTxn._label = self._label spooledBase._unspool(baseTxn) @@ -1046,6 +1047,7 @@ def _reallyClose(): if self._connection: self._connection.close() + self._connection = None self._holder.submit(_reallyClose) Modified: twext/trunk/twext/enterprise/fixtures.py =================================================================== --- twext/trunk/twext/enterprise/fixtures.py 2015-10-29 19:04:13 UTC (rev 15252) +++ twext/trunk/twext/enterprise/fixtures.py 2015-10-30 14:40:20 UTC (rev 15253) @@ -27,10 +27,10 @@ from zope.interface.verify import verifyClass from twisted.internet.interfaces import IReactorThreads +from twisted.internet.defer import Deferred +from twisted.internet.task import Clock from twisted.python.threadpool import ThreadPool -from twisted.internet.task import Clock - from twext.enterprise.adbapi2 import ConnectionPool from twext.enterprise.ienterprise import SQLITE_DIALECT from twext.enterprise.ienterprise import POSTGRES_DIALECT @@ -118,6 +118,10 @@ return super(FakeThreadHolder, self).start() + def retry(self): + pass + + def stop(self): result = super(FakeThreadHolder, self).stop() self.stopped = True @@ -147,6 +151,10 @@ self._q_ = newq + def callLater(self, f, *a, **k): + return Deferred() + + def callFromThread(self, f, *a, **k): result = f(*a, **k) return result Modified: twext/trunk/twext/enterprise/jobs/test/test_jobs.py =================================================================== --- twext/trunk/twext/enterprise/jobs/test/test_jobs.py 2015-10-29 19:04:13 UTC (rev 15252) +++ twext/trunk/twext/enterprise/jobs/test/test_jobs.py 2015-10-30 14:40:20 UTC (rev 15253) @@ -1655,7 +1655,8 @@ @transactionally(self.store.newTransaction) def _enqueue(txn): return txn.enqueue( - DummyWorkPauseItem, a=30, b=40, workID=1 + DummyWorkPauseItem, a=30, b=40, workID=1, + notBefore=datetime.datetime.utcnow() + datetime.timedelta(seconds=1) ) yield _enqueue @@ -1740,7 +1741,8 @@ @transactionally(self.store.newTransaction) def _enqueue(txn): return txn.enqueue( - DummyWorkPauseItem, a=30, b=40, workID=1 + DummyWorkPauseItem, a=30, b=40, workID=1, + notBefore=datetime.datetime.utcnow() + datetime.timedelta(seconds=1) ) yield _enqueue @@ -1810,7 +1812,8 @@ @transactionally(self.store.newTransaction) def _enqueue(txn): return txn.enqueue( - DummyWorkPauseItem, a=30, b=40, workID=1 + DummyWorkPauseItem, a=30, b=40, workID=1, + notBefore=datetime.datetime.utcnow() + datetime.timedelta(seconds=1) ) yield _enqueue Modified: twext/trunk/twext/internet/threadutils.py =================================================================== --- twext/trunk/twext/internet/threadutils.py 2015-10-29 19:04:13 UTC (rev 15252) +++ twext/trunk/twext/internet/threadutils.py 2015-10-30 14:40:20 UTC (rev 15253) @@ -24,9 +24,10 @@ _DONE = object() -_STATE_STOPPED = 'STOPPED' +_STATE_STARTING = 'STARTING' _STATE_RUNNING = 'RUNNING' _STATE_STOPPING = 'STOPPING' +_STATE_STOPPED = 'STOPPED' class ThreadHolder(object): """ @@ -39,12 +40,14 @@ self._state = _STATE_STOPPED self._stopper = None self._q = None + self._retryCallback = None def _run(self): """ Worker function which runs in a non-reactor thread. """ + self._state = _STATE_RUNNING while self._qpull(): pass @@ -90,7 +93,7 @@ @return: L{Deferred} that fires with the result of L{work} """ - if self._state != _STATE_RUNNING: + if self._state not in (_STATE_RUNNING, _STATE_STARTING): raise RuntimeError("not running") d = Deferred() self._q.put((d, work)) @@ -103,18 +106,31 @@ """ if self._state != _STATE_STOPPED: raise RuntimeError("Not stopped.") - self._state = _STATE_RUNNING + self._state = _STATE_STARTING self._q = Queue(0) self._reactor.callInThread(self._run) + self.retry() + def retry(self): + if self._state == _STATE_STARTING: + if self._retryCallback is not None: + self._reactor.threadpool._startSomeWorkers() + self._retryCallback = self._reactor.callLater(0.1, self.retry) + else: + self._retryCallback = None + + def stop(self): """ Stop this thing and release its thread, if it's running. """ - if self._state != _STATE_RUNNING: + if self._state not in (_STATE_RUNNING, _STATE_STARTING): raise RuntimeError("Not running.") s = self._stopper = Deferred() self._state = _STATE_STOPPING self._q.put(_DONE) + if self._retryCallback: + self._retryCallback.cancel() + self._retryCallback = None return s

1 0