<!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>[14722] CalendarServer/trunk/calendarserver</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/14722">14722</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-04-29 10:25:01 -0700 (Wed, 29 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Post an alert if our data volume is missing or is a 'phantom' volume</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertapcaldavpy">CalendarServer/trunk/calendarserver/tap/caldav.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertaputilpy">CalendarServer/trunk/calendarserver/tap/util.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsutilpy">CalendarServer/trunk/calendarserver/tools/util.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertapcaldavpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/caldav.py (14721 => 14722)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/caldav.py 2015-04-29 15:19:55 UTC (rev 14721)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py 2015-04-29 17:25:01 UTC (rev 14722)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx">
</span><span class="cx"> import sys
</span><span class="cx"> from collections import OrderedDict
</span><del>-from os import getuid, getgid, umask, remove, environ, stat, chown
</del><ins>+from os import getuid, getgid, umask, remove, environ, stat, chown, W_OK
</ins><span class="cx"> from os.path import exists, basename
</span><span class="cx"> import socket
</span><span class="cx"> from stat import S_ISSOCK
</span><span class="lines">@@ -1434,6 +1434,15 @@
</span><span class="cx"> config.addPostUpdateHooks((agentPostUpdateHook,))
</span><span class="cx"> config.reload()
</span><span class="cx">
</span><ins>+ # Verify that server root actually exists and is not phantom
+ from calendarserver.tools.util import checkDirectory
+ checkDirectory(
+ config.ServerRoot,
+ "Server root",
+ access=W_OK,
+ wait=True # Wait in a loop until ServerRoot exists and is not phantom
+ )
+
</ins><span class="cx"> # These we need to set in order to open the store
</span><span class="cx"> config.EnableCalDAV = config.EnableCardDAV = True
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertaputilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/util.py (14721 => 14722)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/util.py 2015-04-29 15:19:55 UTC (rev 14721)
+++ CalendarServer/trunk/calendarserver/tap/util.py 2015-04-29 17:25:01 UTC (rev 14722)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> "getRootResource",
</span><span class="cx"> "getSSLPassphrase",
</span><span class="cx"> "MemoryLimitService",
</span><ins>+ "postAlert",
</ins><span class="cx"> "preFlightChecks",
</span><span class="cx"> ]
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/util.py (14721 => 14722)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/util.py 2015-04-29 15:19:55 UTC (rev 14721)
+++ CalendarServer/trunk/calendarserver/tools/util.py 2015-04-29 17:25:01 UTC (rev 14722)
</span><span class="lines">@@ -32,6 +32,8 @@
</span><span class="cx"> from grp import getgrnam
</span><span class="cx"> from uuid import UUID
</span><span class="cx">
</span><ins>+from calendarserver.tools import diagnose
+
</ins><span class="cx"> from twistedcaldav.config import config, ConfigurationError
</span><span class="cx"> from twistedcaldav.stdconfig import DEFAULT_CONFIG_FILE
</span><span class="cx">
</span><span class="lines">@@ -140,12 +142,22 @@
</span><span class="cx"> # Note: we have to use print here because the logging mechanism has not
</span><span class="cx"> # been set up yet.
</span><span class="cx">
</span><del>- if not os.path.exists(dirpath):
</del><ins>+ if not os.path.exists(dirpath) or (diagnose.detectPhantomVolume(dirpath) == diagnose.EXIT_CODE_PHANTOM_DATA_VOLUME):
</ins><span class="cx">
</span><span class="cx"> if wait:
</span><del>- while not os.path.exists(dirpath):
- print("Path does not exist: %s" % (dirpath,))
- sleep(1)
</del><ins>+
+ # If we're being told to wait, post an alert that we can't continue
+ # until the volume is mounted
+ if not os.path.exists(dirpath) or (diagnose.detectPhantomVolume(dirpath) == diagnose.EXIT_CODE_PHANTOM_DATA_VOLUME):
+ from calendarserver.tap.util import postAlert
+ postAlert("MissingDataVolumeAlert", ["volumePath", dirpath])
+
+ while not os.path.exists(dirpath) or (diagnose.detectPhantomVolume(dirpath) == diagnose.EXIT_CODE_PHANTOM_DATA_VOLUME):
+ if not os.path.exists(dirpath):
+ print("Path does not exist: %s" % (dirpath,))
+ else:
+ print("Path is not a real volume: %s" % (dirpath,))
+ sleep(5)
</ins><span class="cx"> else:
</span><span class="cx"> try:
</span><span class="cx"> mode, username, groupname = create
</span></span></pre>
</div>
</div>
</body>
</html>