[CalendarServer-changes] [14044] CalendarServer/branches/release/CalendarServer-5.3-dev/txdav/base/ datastore/subpostgres.py

source_changes at macosforge.org source_changes at macosforge.org
Mon Oct 6 10:26:14 PDT 2014


Revision: 14044
          http://trac.calendarserver.org//changeset/14044
Author:   sagen at apple.com
Date:     2014-10-06 10:26:14 -0700 (Mon, 06 Oct 2014)
Log Message:
-----------
Tell pg_ctl to wait longer to account for a long cluster upgrade

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-5.3-dev/txdav/base/datastore/subpostgres.py

Modified: CalendarServer/branches/release/CalendarServer-5.3-dev/txdav/base/datastore/subpostgres.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-5.3-dev/txdav/base/datastore/subpostgres.py	2014-10-06 17:08:09 UTC (rev 14043)
+++ CalendarServer/branches/release/CalendarServer-5.3-dev/txdav/base/datastore/subpostgres.py	2014-10-06 17:26:14 UTC (rev 14044)
@@ -228,7 +228,7 @@
                 # in /tmp and based on a hash of the data store directory
                 digest = md5(dataStoreDirectory.path).hexdigest()
                 socketDir = "/tmp/ccs_postgres_" + digest
-                
+
             self.socketDir = CachingFilePath(socketDir)
             self.host = self.socketDir.path
             self.port = None
@@ -425,6 +425,7 @@
                 pgCtl,
                 "start",
                 "-l", self.logFile,
+                "-t 86400",  # Give plenty of time for a long cluster upgrade
                 "-w",
                 # XXX what are the quoting rules for '-o'?  do I need to repr()
                 # the path here?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20141006/916de2bb/attachment-0001.html>


More information about the calendarserver-changes mailing list