<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[14990] CalendarServer/trunk/txdav/base/datastore/subpostgres.py</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/14990">14990</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-07-23 17:31:11 -0700 (Thu, 23 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>If the pg_ctl program becomes missing or has changed by the time we want to stop, instead send SIGTERM to postgres.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavbasedatastoresubpostgrespy">CalendarServer/trunk/txdav/base/datastore/subpostgres.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavbasedatastoresubpostgrespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/base/datastore/subpostgres.py (14989 => 14990)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/base/datastore/subpostgres.py        2015-07-23 19:33:13 UTC (rev 14989)
+++ CalendarServer/trunk/txdav/base/datastore/subpostgres.py        2015-07-24 00:31:11 UTC (rev 14990)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> from twext.python.filepath import CachingFilePath
</span><span class="cx">
</span><span class="cx"> from twisted.protocols.basic import LineReceiver
</span><del>-from twisted.internet.defer import Deferred
</del><ins>+from twisted.internet.defer import Deferred, succeed
</ins><span class="cx"> from txdav.base.datastore.dbapiclient import DBAPIConnector
</span><span class="cx"> from txdav.base.datastore.dbapiclient import postgres
</span><span class="cx"> from txdav.common.icommondatastore import InternalDataStoreError
</span><span class="lines">@@ -280,6 +280,15 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> self._pgCtl = locateCommand("pg_ctl", pgCtl)
</span><ins>+
+ # Make note of the inode for the pg_ctl script; if it changes or is
+ # missing when it comes time to stop postgres, instead send SIGTERM
+ # to stop our postgres (since we can't do a graceful shutdown)
+ try:
+ self._pgCtlInode = os.stat(self._pgCtl).st_ino
+ except:
+ self._pgCtlInode = 0
+
</ins><span class="cx"> self._initdb = locateCommand("initdb", initDB)
</span><span class="cx"> self._reactor = reactor
</span><span class="cx"> self._postgresPid = None
</span><span class="lines">@@ -657,30 +666,38 @@
</span><span class="cx"> # If pg_ctl's startup wasn't successful, don't bother to stop the
</span><span class="cx"> # database. (This also happens in command-line tools.)
</span><span class="cx"> if self.shouldStopDatabase:
</span><del>- monitor = PostgresMonitor()
- args = [
- self._pgCtl, "stop",
- "--log={}".format(self.logFile),
- ]
- log.info("Requesting postgres stop via: {args}", args=args)
- self.reactor.spawnProcess(
- monitor, self._pgCtl,
- args,
- env=self.env, path=self.workingDir.path,
- uid=self.uid, gid=self.gid,
- )
- return monitor.completionDeferred
</del><ins>+
+ # Compare pg_ctl inode with one we saw at the start; if different
+ # (or missing), fall back to SIGTERM
+ try:
+ newInode = os.stat(self._pgCtl).st_ino
+ except OSError:
+ # Missing
+ newInode = -1
+
+ if self._pgCtlInode != newInode:
+ # send SIGTERM to postgres
+ if self._postgresPid:
+ os.kill(self._postgresPid, signal.SIGTERM)
+ return succeed(None)
+ else:
+ # use pg_ctl stop
+ monitor = PostgresMonitor()
+ args = [
+ self._pgCtl, "stop",
+ "--log={}".format(self.logFile),
+ ]
+ log.info("Requesting postgres stop via: {args}", args=args)
+ self.reactor.spawnProcess(
+ monitor, self._pgCtl,
+ args,
+ env=self.env, path=self.workingDir.path,
+ uid=self.uid, gid=self.gid,
+ )
+ return monitor.completionDeferred
</ins><span class="cx"> return d.addCallback(superStopped)
</span><span class="cx">
</span><del>-# def maybeStopSubprocess(result):
-# if self.monitor is not None:
-# self.monitor.transport.signalProcess("INT")
-# return self.monitor.completionDeferred
-# return result
-# d.addCallback(maybeStopSubprocess)
-# return d
</del><span class="cx">
</span><del>-
</del><span class="cx"> def hardStop(self):
</span><span class="cx"> """
</span><span class="cx"> Stop postgres quickly by sending it SIGQUIT
</span></span></pre>
</div>
</div>
</body>
</html>