<!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>[14694] 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/14694">14694</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-04-21 15:54:54 -0700 (Tue, 21 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Server won't start if ServerRoot is on a phantom volume</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertaputilpy">CalendarServer/trunk/calendarserver/tap/util.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsdiagnosepy">CalendarServer/trunk/calendarserver/tools/diagnose.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertaputilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/util.py (14693 => 14694)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/util.py 2015-04-21 17:03:42 UTC (rev 14693)
+++ CalendarServer/trunk/calendarserver/tap/util.py 2015-04-21 22:54:54 UTC (rev 14694)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> from calendarserver.provision.root import RootResource
</span><span class="cx"> from calendarserver.push.applepush import APNSubscriptionResource
</span><span class="cx"> from calendarserver.push.notifier import NotifierFactory
</span><ins>+from calendarserver.tools import diagnose
</ins><span class="cx"> from calendarserver.tools.util import checkDirectory
</span><span class="cx"> from calendarserver.webadmin.landing import WebAdminLandingResource
</span><span class="cx"> from calendarserver.webcal.resource import WebCalendarResource
</span><span class="lines">@@ -1201,6 +1202,9 @@
</span><span class="cx"> success, reason = verifyConfig(config)
</span><span class="cx">
</span><span class="cx"> if success:
</span><ins>+ success, reason = verifyServerRoot(config)
+
+ if success:
</ins><span class="cx"> success, reason = verifyTLSCertificate(config)
</span><span class="cx">
</span><span class="cx"> if success:
</span><span class="lines">@@ -1240,7 +1244,21 @@
</span><span class="cx"> return False, "Neither CalDAV nor CardDAV are enabled"
</span><span class="cx">
</span><span class="cx">
</span><ins>+def verifyServerRoot(config):
+ """
+ Ensure server root is not on a phantom volume
+ """
+ result = diagnose.detectPhantomVolume(config.ServerRoot)
</ins><span class="cx">
</span><ins>+ if result == diagnose.EXIT_CODE_SERVER_ROOT_MISSING:
+ return False, "ServerRoot is missing"
+
+ if result == diagnose.EXIT_CODE_PHANTOM_DATA_VOLUME:
+ return False, "ServerRoot is supposed to be on a non-boot-volume but it's not"
+
+ return True, "ServerRoot is ok"
+
+
</ins><span class="cx"> def verifyTLSCertificate(config):
</span><span class="cx"> """
</span><span class="cx"> If a TLS certificate is configured, make sure it exists, is non empty,
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsdiagnosepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/diagnose.py (14693 => 14694)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/diagnose.py 2015-04-21 17:03:42 UTC (rev 14693)
+++ CalendarServer/trunk/calendarserver/tools/diagnose.py 2015-04-21 22:54:54 UTC (rev 14694)
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx"> optargs, _ignore_args = getopt(
</span><span class="cx"> sys.argv[1:], "h", [
</span><span class="cx"> "help",
</span><ins>+ "phantom",
</ins><span class="cx"> ],
</span><span class="cx"> )
</span><span class="cx"> except GetoptError, e:
</span><span class="lines">@@ -84,7 +85,11 @@
</span><span class="cx"> if opt in ("-h", "--help"):
</span><span class="cx"> usage()
</span><span class="cx">
</span><ins>+ elif opt == "--phantom":
+ result = detectPhantomVolume()
+ sys.exit(result)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> osBuild = getOSBuild()
</span><span class="cx"> print("OS Build: {}".format(osBuild))
</span><span class="cx">
</span><span class="lines">@@ -105,6 +110,14 @@
</span><span class="cx"> serverRoot = getServerRoot()
</span><span class="cx"> print("Prefs plist says ServerRoot directory is: {}".format(serverRoot.encode("utf-8")))
</span><span class="cx">
</span><ins>+ result = detectPhantomVolume(serverRoot)
+ if result == EXIT_CODE_OK:
+ print("ServerRoot volume ok")
+ elif result == EXIT_CODE_SERVER_ROOT_MISSING:
+ print("ServerRoot directory missing")
+ elif result == EXIT_CODE_PHANTOM_DATA_VOLUME:
+ print("Phantom ServerRoot volume detected")
+
</ins><span class="cx"> systemPlist = os.path.join(serverRoot, "Config", "caldavd-system.plist")
</span><span class="cx"> try:
</span><span class="cx"> if checkPlist(systemPlist):
</span><span class="lines">@@ -156,7 +169,32 @@
</span><span class="cx"> showWebApps()
</span><span class="cx">
</span><span class="cx">
</span><ins>+EXIT_CODE_OK = 0
+EXIT_CODE_SERVER_ROOT_MISSING = 1
+EXIT_CODE_PHANTOM_DATA_VOLUME = 2
</ins><span class="cx">
</span><ins>+def detectPhantomVolume(serverRoot=None):
+ """
+ Check to see if serverRoot directory exists in a "phantom" volume, meaning
+ it's simply a directory under /Volumes residing on the boot volume, rather
+ that a real separate volume.
+ """
+
+ if not serverRoot:
+ serverRoot = getServerRoot()
+
+ if not os.path.exists(serverRoot):
+ return EXIT_CODE_SERVER_ROOT_MISSING
+
+ if serverRoot.startswith("/Volumes/"):
+ bootDevice = os.stat("/").st_dev
+ dataDevice = os.stat(serverRoot).st_dev
+ if bootDevice == dataDevice:
+ return EXIT_CODE_PHANTOM_DATA_VOLUME
+
+ return EXIT_CODE_OK
+
+
</ins><span class="cx"> def showProcesses():
</span><span class="cx">
</span><span class="cx"> print()
</span></span></pre>
</div>
</div>
</body>
</html>