[CalendarServer-changes] [9896] CalendarServer/branches/release/CalendarServer-4.2-dev
source_changes at macosforge.org
source_changes at macosforge.org
Fri Oct 5 09:59:13 PDT 2012
Revision: 9896
http://trac.calendarserver.org//changeset/9896
Author: sagen at apple.com
Date: 2012-10-05 09:59:13 -0700 (Fri, 05 Oct 2012)
Log Message:
-----------
Merge r9895 from trunk (memory limiter)
Revision Links:
--------------
http://trac.calendarserver.org//changeset/9895
Modified Paths:
--------------
CalendarServer/branches/release/CalendarServer-4.2-dev/calendarserver/tap/caldav.py
CalendarServer/branches/release/CalendarServer-4.2-dev/calendarserver/tap/test/test_util.py
CalendarServer/branches/release/CalendarServer-4.2-dev/calendarserver/tap/util.py
CalendarServer/branches/release/CalendarServer-4.2-dev/twistedcaldav/stdconfig.py
Property Changed:
----------------
CalendarServer/branches/release/CalendarServer-4.2-dev/
Property changes on: CalendarServer/branches/release/CalendarServer-4.2-dev
___________________________________________________________________
Modified: svn:mergeinfo
- /CalendarServer/branches/config-separation:4379-4443
/CalendarServer/branches/egg-info-351:4589-4625
/CalendarServer/branches/generic-sqlstore:6167-6191
/CalendarServer/branches/new-store:5594-5934
/CalendarServer/branches/new-store-no-caldavfile:5911-5935
/CalendarServer/branches/new-store-no-caldavfile-2:5936-5981
/CalendarServer/branches/users/cdaboo/batchupload-6699:6700-7198
/CalendarServer/branches/users/cdaboo/cached-subscription-calendars-5692:5693-5702
/CalendarServer/branches/users/cdaboo/component-set-fixes:8130-8346
/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
/CalendarServer/branches/users/cdaboo/implicituidrace:8137-8141
/CalendarServer/branches/users/cdaboo/more-sharing-5591:5592-5601
/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
/CalendarServer/branches/users/cdaboo/pods:7297-7377
/CalendarServer/branches/users/cdaboo/pycalendar:7085-7206
/CalendarServer/branches/users/cdaboo/pycard:7227-7237
/CalendarServer/branches/users/cdaboo/queued-attendee-refreshes:7740-8287
/CalendarServer/branches/users/cdaboo/relative-config-paths-5070:5071-5105
/CalendarServer/branches/users/cdaboo/shared-calendars-5187:5188-5440
/CalendarServer/branches/users/cdaboo/timezones:7443-7699
/CalendarServer/branches/users/cdaboo/txn-debugging:8730-8743
/CalendarServer/branches/users/glyph/case-insensitive-uid:8772-8805
/CalendarServer/branches/users/glyph/conn-limit:6574-6577
/CalendarServer/branches/users/glyph/contacts-server-merge:4971-5080
/CalendarServer/branches/users/glyph/dalify:6932-7023
/CalendarServer/branches/users/glyph/db-reconnect:6824-6876
/CalendarServer/branches/users/glyph/deploybuild:7563-7572
/CalendarServer/branches/users/glyph/disable-quota:7718-7727
/CalendarServer/branches/users/glyph/dont-start-postgres:6592-6614
/CalendarServer/branches/users/glyph/imip-and-admin-html:7866-7984
/CalendarServer/branches/users/glyph/ipv6-client:9054-9105
/CalendarServer/branches/users/glyph/linux-tests:6893-6900
/CalendarServer/branches/users/glyph/migrate-merge:8690-8713
/CalendarServer/branches/users/glyph/misc-portability-fixes:7365-7374
/CalendarServer/branches/users/glyph/more-deferreds-6:6322-6368
/CalendarServer/branches/users/glyph/more-deferreds-7:6369-6445
/CalendarServer/branches/users/glyph/multiget-delete:8321-8330
/CalendarServer/branches/users/glyph/new-export:7444-7485
/CalendarServer/branches/users/glyph/oracle:7106-7155
/CalendarServer/branches/users/glyph/oracle-nulls:7340-7351
/CalendarServer/branches/users/glyph/other-html:8062-8091
/CalendarServer/branches/users/glyph/parallel-sim:8240-8251
/CalendarServer/branches/users/glyph/parallel-upgrade:8376-8400
/CalendarServer/branches/users/glyph/parallel-upgrade_to_1:8571-8583
/CalendarServer/branches/users/glyph/q:9560-9688
/CalendarServer/branches/users/glyph/quota:7604-7637
/CalendarServer/branches/users/glyph/sendfdport:5388-5424
/CalendarServer/branches/users/glyph/shared-pool-fixes:8436-8443
/CalendarServer/branches/users/glyph/shared-pool-take2:8155-8174
/CalendarServer/branches/users/glyph/sharedpool:6490-6550
/CalendarServer/branches/users/glyph/sharing-api:9192-9205
/CalendarServer/branches/users/glyph/skip-lonely-vtimezones:8524-8535
/CalendarServer/branches/users/glyph/sql-store:5929-6073
/CalendarServer/branches/users/glyph/subtransactions:7248-7258
/CalendarServer/branches/users/glyph/table-alias:8651-8664
/CalendarServer/branches/users/glyph/uidexport:7673-7676
/CalendarServer/branches/users/glyph/use-system-twisted:5084-5149
/CalendarServer/branches/users/glyph/uuid-normalize:9268-9296
/CalendarServer/branches/users/glyph/xattrs-from-files:7757-7769
/CalendarServer/branches/users/sagen/applepush:8126-8184
/CalendarServer/branches/users/sagen/inboxitems:7380-7381
/CalendarServer/branches/users/sagen/locations-resources:5032-5051
/CalendarServer/branches/users/sagen/locations-resources-2:5052-5061
/CalendarServer/branches/users/sagen/purge_old_events:6735-6746
/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
/CalendarServer/branches/users/sagen/resources-2:5084-5093
/CalendarServer/branches/users/wsanchez/transations:5515-5593
/CalendarServer/trunk:9867,9870,9876
+ /CalendarServer/branches/config-separation:4379-4443
/CalendarServer/branches/egg-info-351:4589-4625
/CalendarServer/branches/generic-sqlstore:6167-6191
/CalendarServer/branches/new-store:5594-5934
/CalendarServer/branches/new-store-no-caldavfile:5911-5935
/CalendarServer/branches/new-store-no-caldavfile-2:5936-5981
/CalendarServer/branches/users/cdaboo/batchupload-6699:6700-7198
/CalendarServer/branches/users/cdaboo/cached-subscription-calendars-5692:5693-5702
/CalendarServer/branches/users/cdaboo/component-set-fixes:8130-8346
/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
/CalendarServer/branches/users/cdaboo/implicituidrace:8137-8141
/CalendarServer/branches/users/cdaboo/more-sharing-5591:5592-5601
/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
/CalendarServer/branches/users/cdaboo/pods:7297-7377
/CalendarServer/branches/users/cdaboo/pycalendar:7085-7206
/CalendarServer/branches/users/cdaboo/pycard:7227-7237
/CalendarServer/branches/users/cdaboo/queued-attendee-refreshes:7740-8287
/CalendarServer/branches/users/cdaboo/relative-config-paths-5070:5071-5105
/CalendarServer/branches/users/cdaboo/shared-calendars-5187:5188-5440
/CalendarServer/branches/users/cdaboo/timezones:7443-7699
/CalendarServer/branches/users/cdaboo/txn-debugging:8730-8743
/CalendarServer/branches/users/glyph/case-insensitive-uid:8772-8805
/CalendarServer/branches/users/glyph/conn-limit:6574-6577
/CalendarServer/branches/users/glyph/contacts-server-merge:4971-5080
/CalendarServer/branches/users/glyph/dalify:6932-7023
/CalendarServer/branches/users/glyph/db-reconnect:6824-6876
/CalendarServer/branches/users/glyph/deploybuild:7563-7572
/CalendarServer/branches/users/glyph/disable-quota:7718-7727
/CalendarServer/branches/users/glyph/dont-start-postgres:6592-6614
/CalendarServer/branches/users/glyph/imip-and-admin-html:7866-7984
/CalendarServer/branches/users/glyph/ipv6-client:9054-9105
/CalendarServer/branches/users/glyph/linux-tests:6893-6900
/CalendarServer/branches/users/glyph/migrate-merge:8690-8713
/CalendarServer/branches/users/glyph/misc-portability-fixes:7365-7374
/CalendarServer/branches/users/glyph/more-deferreds-6:6322-6368
/CalendarServer/branches/users/glyph/more-deferreds-7:6369-6445
/CalendarServer/branches/users/glyph/multiget-delete:8321-8330
/CalendarServer/branches/users/glyph/new-export:7444-7485
/CalendarServer/branches/users/glyph/oracle:7106-7155
/CalendarServer/branches/users/glyph/oracle-nulls:7340-7351
/CalendarServer/branches/users/glyph/other-html:8062-8091
/CalendarServer/branches/users/glyph/parallel-sim:8240-8251
/CalendarServer/branches/users/glyph/parallel-upgrade:8376-8400
/CalendarServer/branches/users/glyph/parallel-upgrade_to_1:8571-8583
/CalendarServer/branches/users/glyph/q:9560-9688
/CalendarServer/branches/users/glyph/quota:7604-7637
/CalendarServer/branches/users/glyph/sendfdport:5388-5424
/CalendarServer/branches/users/glyph/shared-pool-fixes:8436-8443
/CalendarServer/branches/users/glyph/shared-pool-take2:8155-8174
/CalendarServer/branches/users/glyph/sharedpool:6490-6550
/CalendarServer/branches/users/glyph/sharing-api:9192-9205
/CalendarServer/branches/users/glyph/skip-lonely-vtimezones:8524-8535
/CalendarServer/branches/users/glyph/sql-store:5929-6073
/CalendarServer/branches/users/glyph/subtransactions:7248-7258
/CalendarServer/branches/users/glyph/table-alias:8651-8664
/CalendarServer/branches/users/glyph/uidexport:7673-7676
/CalendarServer/branches/users/glyph/use-system-twisted:5084-5149
/CalendarServer/branches/users/glyph/uuid-normalize:9268-9296
/CalendarServer/branches/users/glyph/xattrs-from-files:7757-7769
/CalendarServer/branches/users/sagen/applepush:8126-8184
/CalendarServer/branches/users/sagen/inboxitems:7380-7381
/CalendarServer/branches/users/sagen/locations-resources:5032-5051
/CalendarServer/branches/users/sagen/locations-resources-2:5052-5061
/CalendarServer/branches/users/sagen/purge_old_events:6735-6746
/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
/CalendarServer/branches/users/sagen/resources-2:5084-5093
/CalendarServer/branches/users/wsanchez/transations:5515-5593
/CalendarServer/trunk:9867,9870,9876,9895
Modified: CalendarServer/branches/release/CalendarServer-4.2-dev/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-4.2-dev/calendarserver/tap/caldav.py 2012-10-04 19:18:18 UTC (rev 9895)
+++ CalendarServer/branches/release/CalendarServer-4.2-dev/calendarserver/tap/caldav.py 2012-10-05 16:59:13 UTC (rev 9896)
@@ -75,7 +75,7 @@
from twistedcaldav.stdconfig import DEFAULT_CONFIG, DEFAULT_CONFIG_FILE
from twistedcaldav.upgrade import UpgradeFileSystemFormatService, PostDBImportService
-from calendarserver.tap.util import pgServiceFromConfig, getDBPool
+from calendarserver.tap.util import pgServiceFromConfig, getDBPool, MemoryLimitService
from twext.enterprise.ienterprise import POSTGRES_DIALECT
from twext.enterprise.ienterprise import ORACLE_DIALECT
@@ -1195,6 +1195,11 @@
s.processMonitor = monitor
monitor.setServiceParent(s)
+ if config.MemoryLimiter.Enabled:
+ memoryLimiter = MemoryLimitService(monitor, config.MemoryLimiter.Seconds,
+ config.MemoryLimiter.Bytes, config.MemoryLimiter.ResidentOnly)
+ memoryLimiter.setServiceParent(s)
+
for name, pool in config.Memcached.Pools.items():
if pool.ServerEnabled:
self.log_info(
@@ -1636,7 +1641,6 @@
for name in self.processes:
self.startProcess(name)
-
def stopService(self):
"""
Return a deferred that fires when all child processes have ended.
Modified: CalendarServer/branches/release/CalendarServer-4.2-dev/calendarserver/tap/test/test_util.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-4.2-dev/calendarserver/tap/test/test_util.py 2012-10-04 19:18:18 UTC (rev 9895)
+++ CalendarServer/branches/release/CalendarServer-4.2-dev/calendarserver/tap/test/test_util.py 2012-10-05 16:59:13 UTC (rev 9896)
@@ -14,10 +14,11 @@
# limitations under the License.
##
-from calendarserver.tap.util import computeProcessCount, directoryFromConfig
+from calendarserver.tap.util import computeProcessCount, directoryFromConfig, MemoryLimitService
from twistedcaldav.test.util import TestCase
from twistedcaldav.config import config
from twistedcaldav.directory.augment import AugmentXMLDB
+from twisted.internet.task import Clock
class ProcessCountTestCase(TestCase):
@@ -62,3 +63,72 @@
# augmentService set to AugmentXMLDB
if hasattr(service, "augmentService"):
self.assertTrue(isinstance(service.augmentService, AugmentXMLDB))
+
+
+
+# Stub classes for MemoryLimitServiceTestCase
+
+class StubProtocol(object):
+ def __init__(self, transport):
+ self.transport = transport
+
+class StubProcess(object):
+ def __init__(self, pid):
+ self.pid = pid
+
+class StubProcessMonitor(object):
+ def __init__(self, processes, protocols):
+ self.processes = processes
+ self.protocols = protocols
+ self.history = []
+
+ def stopProcess(self, name):
+ self.history.append(name)
+
+
+class MemoryLimitServiceTestCase(TestCase):
+
+ def test_checkMemory(self):
+ """
+ Set up stub objects to verify MemoryLimitService.checkMemory( )
+ only stops the processes whose memory usage exceeds the configured
+ limit, and skips memcached
+ """
+ data = {
+ # PID : (name, resident memory-in-bytes, virtual memory-in-bytes)
+ 101 : ("process #1", 10, 1010),
+ 102 : ("process #2", 30, 1030),
+ 103 : ("process #3", 50, 1050),
+ 99 : ("memcached-Default", 10, 1010),
+ }
+
+ processes = []
+ protocols = {}
+ for pid, (name, resident, virtual) in data.iteritems():
+ protocols[name] = StubProtocol(StubProcess(pid))
+ processes.append(name)
+ processMonitor = StubProcessMonitor(processes, protocols)
+ clock = Clock()
+ service = MemoryLimitService(processMonitor, 10, 15, True, reactor=clock)
+
+ # For testing, use a stub implementation of memory-usage lookup
+ def testMemoryForPID(pid, residentOnly):
+ return data[pid][1 if residentOnly else 2]
+ service._memoryForPID = testMemoryForPID
+
+ # After 5 seconds, nothing should have happened, since the interval is 10 seconds
+ service.startService()
+ clock.advance(5)
+ self.assertEquals(processMonitor.history, [])
+
+ # After 7 more seconds, processes 2 and 3 should have been stopped since their
+ # memory usage exceeds 10 bytes
+ clock.advance(7)
+ self.assertEquals(processMonitor.history, ['process #2', 'process #3'])
+
+ # Now switch to looking at virtual memory, in which case all 3 processes
+ # should be stopped
+ service._residentOnly = False
+ processMonitor.history = []
+ clock.advance(10)
+ self.assertEquals(processMonitor.history, ['process #1', 'process #2', 'process #3'])
Modified: CalendarServer/branches/release/CalendarServer-4.2-dev/calendarserver/tap/util.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-4.2-dev/calendarserver/tap/util.py 2012-10-04 19:18:18 UTC (rev 9895)
+++ CalendarServer/branches/release/CalendarServer-4.2-dev/calendarserver/tap/util.py 2012-10-05 16:59:13 UTC (rev 9896)
@@ -23,12 +23,14 @@
"getRootResource",
"getDBPool",
"FakeRequest",
+ "MemoryLimitService",
]
import errno
import os
from time import sleep
from socket import fromfd, AF_UNIX, SOCK_STREAM, socketpair
+import psutil
from twext.python.filepath import CachingFilePath as FilePath
from twext.python.log import Logger
@@ -37,6 +39,7 @@
from twext.web2.http_headers import Headers
from twext.web2.static import File as FileResource
+from twisted.application.service import Service
from twisted.cred.portal import Portal
from twisted.internet.defer import inlineCallbacks, returnValue
from twisted.internet import reactor as _reactor
@@ -68,6 +71,7 @@
from twext.enterprise.ienterprise import ORACLE_DIALECT
from twext.enterprise.adbapi2 import ConnectionPool, ConnectionPoolConnection
+
try:
from twistedcaldav.authkerb import NegotiateCredentialFactory
NegotiateCredentialFactory # pacify pyflakes
@@ -821,3 +825,90 @@
def addResponseFilter(*args, **kwds):
pass
+
+def memoryForPID(pid, residentOnly=True):
+ """
+ Return the amount of memory in use for the given process. If residentOnly is True,
+ then RSS is returned; if False, then virtual memory is returned.
+ @param pid: process id
+ @type pid: C{int}
+ @param residentOnly: Whether only resident memory should be included
+ @type residentOnly: C{boolean}
+ @return: Memory used by process in bytes
+ @rtype: C{int}
+ """
+ memoryInfo = psutil.Process(pid).get_memory_info()
+ return memoryInfo.rss if residentOnly else memoryInfo.vms
+
+
+class MemoryLimitService(Service, object):
+ """
+ A service which when paired with a DelayedStartupProcessMonitor will periodically
+ examine the memory usage of the monitored processes and stop any which exceed
+ a configured limit. Memcached processes are ignored.
+ """
+
+ def __init__(self, processMonitor, intervalSeconds, limitBytes, residentOnly, reactor=None):
+ """
+ @param processMonitor: the DelayedStartupProcessMonitor
+ @param intervalSeconds: how often to check
+ @type intervalSeconds: C{int}
+ @param limitBytes: any monitored process over this limit is stopped
+ @type limitBytes: C{int}
+ @param residentOnly: whether only resident memory should be included
+ @type residentOnly: C{boolean}
+ @param reactor: for testing
+ """
+ self._processMonitor = processMonitor
+ self._seconds = intervalSeconds
+ self._bytes = limitBytes
+ self._residentOnly = residentOnly
+ self._delayedCall = None
+ if reactor is None:
+ from twisted.internet import reactor
+ self._reactor = reactor
+
+ # Unit tests can swap out _memoryForPID
+ self._memoryForPID = memoryForPID
+
+ def startService(self):
+ """
+ Start scheduling the memory checks
+ """
+ super(MemoryLimitService, self).startService()
+ self._delayedCall = self._reactor.callLater(self._seconds, self.checkMemory)
+
+ def stopService(self):
+ """
+ Stop checking memory
+ """
+ super(MemoryLimitService, self).stopService()
+ if self._delayedCall is not None and self._delayedCall.active():
+ self._delayedCall.cancel()
+ self._delayedCall = None
+
+ def checkMemory(self):
+ """
+ Stop any processes monitored by our paired processMonitor whose resident
+ memory exceeds our configured limitBytes. Reschedule intervalSeconds in
+ the future.
+ """
+ try:
+ for name in self._processMonitor.processes:
+ if name.startswith("memcached"):
+ continue
+ proto = self._processMonitor.protocols.get(name, None)
+ if proto is not None:
+ proc = proto.transport
+ pid = proc.pid
+ try:
+ memory = self._memoryForPID(pid, self._residentOnly)
+ except Exception, e:
+ log.error("Unable to determine memory usage of PID: %d (%s)" % (pid, e))
+ continue
+ if memory > self._bytes:
+ log.warn("Killing large process: %s PID:%d %s:%d" %
+ (name, pid, "Resident" if self._residentOnly else "Virtual", memory))
+ self._processMonitor.stopProcess(name)
+ finally:
+ self._delayedCall = self._reactor.callLater(self._seconds, self.checkMemory)
Modified: CalendarServer/branches/release/CalendarServer-4.2-dev/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-4.2-dev/twistedcaldav/stdconfig.py 2012-10-04 19:18:18 UTC (rev 9895)
+++ CalendarServer/branches/release/CalendarServer-4.2-dev/twistedcaldav/stdconfig.py 2012-10-05 16:59:13 UTC (rev 9896)
@@ -491,6 +491,15 @@
},
},
+ # How large a spawned process is allowed to get before it's stopped
+ "MemoryLimiter" : {
+ "Enabled" : True,
+ "Seconds" : 60, # How often to check memory sizes (in seconds)
+ "Bytes" : 2 * 1024 * 1024 * 1024, # Memory limit (RSS in bytes)
+ "ResidentOnly" : True, # True: only take into account resident memory;
+ # False: include virtual memory
+ },
+
#
# Service ACLs
#
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20121005/b4aee253/attachment-0001.html>
More information about the calendarserver-changes
mailing list