Commit 1fce5cc4 authored by Julien Muchembled's avatar Julien Muchembled

Review logging to keep all debugging information in RAM and flush only if useful

The main goal of this patch is to keep all DEBUG logs and packet logger enabled
without exploding disk usage.
This is done by keeping the last 16 MB (by default) of debugging information in
a RAM buffer, and to emit it to an SQLite DB upon RTMIN signal or in case of
warning and more severe log.

Implementation is also cleaned up for better integration within a framework
or if run standalone. NEO logger is now a direct child of root handler.
Only warnings and more severe logs are forwarded to root handler.

A new script 'neolog' is added to pretty-print the contents of the SQLite log.

In unit tests, logging events are not buffered but emitted immediately.
When a test passes, payloads of all exchanged packets are discarded to reduce
disk usage on test bots.

This slows down performance tests by about 15 % because even if nothing is
written to disk, debug and packet log records are now always rendered.
parent 4df3c4e1
...@@ -20,7 +20,6 @@ import ZODB.interfaces ...@@ -20,7 +20,6 @@ import ZODB.interfaces
import neo.lib import neo.lib
from functools import wraps from functools import wraps
from neo.lib import setupLog
from neo.lib.util import add64 from neo.lib.util import add64
from neo.lib.protocol import ZERO_TID from neo.lib.protocol import ZERO_TID
from .app import Application from .app import Application
...@@ -63,7 +62,7 @@ class Storage(BaseStorage.BaseStorage, ...@@ -63,7 +62,7 @@ class Storage(BaseStorage.BaseStorage,
))) )))
def __init__(self, master_nodes, name, read_only=False, def __init__(self, master_nodes, name, read_only=False,
compress=None, logfile=None, verbose=False, _app=None, compress=None, logfile=None, _app=None,
dynamic_master_list=None, **kw): dynamic_master_list=None, **kw):
""" """
Do not pass those parameters (used internally): Do not pass those parameters (used internally):
...@@ -71,7 +70,8 @@ class Storage(BaseStorage.BaseStorage, ...@@ -71,7 +70,8 @@ class Storage(BaseStorage.BaseStorage,
""" """
if compress is None: if compress is None:
compress = True compress = True
setupLog('CLIENT', filename=logfile, verbose=verbose) if logfile:
neo.lib.logging.setup(logfile)
BaseStorage.BaseStorage.__init__(self, 'NEOStorage(%s)' % (name, )) BaseStorage.BaseStorage.__init__(self, 'NEOStorage(%s)' % (name, ))
# Warning: _is_read_only is used in BaseStorage, do not rename it. # Warning: _is_read_only is used in BaseStorage, do not rename it.
self._is_read_only = read_only self._is_read_only = read_only
...@@ -84,8 +84,6 @@ class Storage(BaseStorage.BaseStorage, ...@@ -84,8 +84,6 @@ class Storage(BaseStorage.BaseStorage,
self._init_kw = { self._init_kw = {
'read_only': read_only, 'read_only': read_only,
'compress': compress, 'compress': compress,
'logfile': logfile,
'verbose': verbose,
'dynamic_master_list': dynamic_master_list, 'dynamic_master_list': dynamic_master_list,
'_app': _app, '_app': _app,
} }
......
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
and is still allowed on a read-only neostorage. and is still allowed on a read-only neostorage.
</description> </description>
</key> </key>
<key name="verbose" datatype="boolean"> <key name="logfile" datatype="path">
<description> <description>
Log debugging information Log debugging information to specified SQLite DB.
</description> </description>
</key> </key>
<key name="dynamic_master_list" datatype="path"> <key name="dynamic_master_list" datatype="path">
......
# #
# Copyright (C) 2006-2011 Nexedi SA # Copyright (C) 2006-2012 Nexedi SA
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
...@@ -14,49 +14,4 @@ ...@@ -14,49 +14,4 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import logging as logging_std from .logger import logging
FMT = ('%(asctime)s %(levelname)-9s %(name)-10s'
' [%(module)14s:%(lineno)3d] \n%(message)s')
class Formatter(logging_std.Formatter):
def formatTime(self, record, datefmt=None):
return logging_std.Formatter.formatTime(self, record,
'%Y-%m-%d %H:%M:%S') + '.%04d' % (record.msecs * 10)
def format(self, record):
lines = iter(logging_std.Formatter.format(self, record).splitlines())
prefix = lines.next()
return '\n'.join(prefix + line for line in lines)
def setupLog(name='NEO', filename=None, verbose=False):
global logging
if verbose:
level = logging_std.DEBUG
else:
level = logging_std.INFO
if logging is not None:
for handler in logging.handlers:
handler.acquire()
try:
handler.close()
finally:
handler.release()
del logging.manager.loggerDict[logging.name]
logging = logging_std.getLogger(name)
for handler in logging.handlers[:]:
logging.removeHandler(handler)
if filename is None:
handler = logging_std.StreamHandler()
else:
handler = logging_std.FileHandler(filename)
handler.setFormatter(Formatter(FMT))
logging.setLevel(level)
logging.addHandler(handler)
logging.propagate = 0
# Create default logger
logging = None
setupLog()
...@@ -72,9 +72,6 @@ class ConfigurationManager(object): ...@@ -72,9 +72,6 @@ class ConfigurationManager(object):
assert cluster != '', "Cluster name must be non-empty" assert cluster != '', "Cluster name must be non-empty"
return cluster return cluster
def getName(self):
return self.__get('name')
def getReplicas(self): def getReplicas(self):
return int(self.__get('replicas')) return int(self.__get('replicas'))
......
...@@ -23,7 +23,6 @@ from .connector import ConnectorException, ConnectorTryAgainException, \ ...@@ -23,7 +23,6 @@ from .connector import ConnectorException, ConnectorTryAgainException, \
ConnectorInProgressException, ConnectorConnectionRefusedException, \ ConnectorInProgressException, ConnectorConnectionRefusedException, \
ConnectorConnectionClosedException ConnectorConnectionClosedException
from .locking import RLock from .locking import RLock
from .logger import PACKET_LOGGER
from .profiling import profiler_decorator from .profiling import profiler_decorator
from .protocol import Errors, PacketMalformedError, Packets, ParserState from .protocol import Errors, PacketMalformedError, Packets, ParserState
from .util import dump, ReadBuffer from .util import dump, ReadBuffer
...@@ -166,7 +165,7 @@ class HandlerSwitcher(object): ...@@ -166,7 +165,7 @@ class HandlerSwitcher(object):
@profiler_decorator @profiler_decorator
def _handle(self, connection, packet): def _handle(self, connection, packet):
assert len(self._pending) == 1 or self._pending[0][0] assert len(self._pending) == 1 or self._pending[0][0]
PACKET_LOGGER.dispatch(connection, packet, False) neo.lib.logging.packet(connection, packet, False)
if connection.isClosed() and packet.ignoreOnClosedConnection(): if connection.isClosed() and packet.ignoreOnClosedConnection():
neo.lib.logging.debug('Ignoring packet %r on closed connection %r', neo.lib.logging.debug('Ignoring packet %r on closed connection %r',
packet, connection) packet, connection)
...@@ -638,7 +637,7 @@ class Connection(BaseConnection): ...@@ -638,7 +637,7 @@ class Connection(BaseConnection):
if was_empty: if was_empty:
# enable polling for writing. # enable polling for writing.
self.em.addWriter(self) self.em.addWriter(self)
PACKET_LOGGER.dispatch(self, packet, True) neo.lib.logging.packet(self, packet, True)
@not_closed @not_closed
def notify(self, packet): def notify(self, packet):
......
# #
# Copyright (C) 2010 Nexedi SA # Copyright (C) 2010-2012 Nexedi SA
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
...@@ -22,34 +22,23 @@ import sys ...@@ -22,34 +22,23 @@ import sys
from functools import wraps from functools import wraps
import neo import neo
# WARNING: This module should only be used for live application debugging. # kill -RTMIN+1 <pid>
# It - by purpose - allows code injection in a running neo process. # Dump information to logs.
# You don't want to enable it in a production environment. Really. # kill -RTMIN+2 <pid>
ENABLED = False # Loads (or reloads) neo.debug module.
# The content is up to you (it's only imported). It can be a breakpoint.
# How to include in python code: def safe_handler(func):
# from neo.debug import register def wrapper(sig, frame):
# register()
#
# How to trigger it:
# Kill python process with:
# SIGUSR1:
# Loads (or reloads) neo.debug module.
# The content is up to you (it's only imported).
# SIGUSR2:
# Triggers a pdb prompt on process' controlling TTY.
def decorate(func):
def decorator(sig, frame):
try: try:
func(sig, frame) func(sig, frame)
except: except:
# Prevent exception from exiting signal handler, so mistakes in # Prevent exception from exiting signal handler, so mistakes in
# "debug" module don't kill process. # "debug" module don't kill process.
traceback.print_exc() traceback.print_exc()
return wraps(func)(decorator) return wraps(func)(wrapper)
@decorate @safe_handler
def debugHandler(sig, frame): def debugHandler(sig, frame):
file, filename, (suffix, mode, type) = imp.find_module('debug', file, filename, (suffix, mode, type) = imp.find_module('debug',
neo.__path__) neo.__path__)
...@@ -95,24 +84,10 @@ def winpdb(depth=0): ...@@ -95,24 +84,10 @@ def winpdb(depth=0):
finally: finally:
os.abort() os.abort()
@decorate
def pdbHandler(sig, frame):
try:
winpdb(2) # depth is 2, because of the decorator
except ImportError:
global _debugger
if _debugger is None:
_debugger = getPdb()
debugger.set_trace(frame)
def register(on_log=None): def register(on_log=None):
if ENABLED: if on_log is not None:
signal.signal(signal.SIGUSR1, debugHandler) @safe_handler
signal.signal(signal.SIGUSR2, pdbHandler) def on_log_signal(signum, signal):
if on_log is not None: on_log()
# use 'kill -RTMIN <pid> signal.signal(signal.SIGRTMIN+1, on_log_signal)
@decorate signal.signal(signal.SIGRTMIN+2, debugHandler)
def on_log_signal(signum, signal):
on_log()
signal.signal(signal.SIGRTMIN, on_log_signal)
# #
# Copyright (C) 2006-2011 Nexedi SA # Copyright (C) 2006-2012 Nexedi SA
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
...@@ -14,57 +14,203 @@ ...@@ -14,57 +14,203 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from base64 import b64encode # WARNING: Log rotating should not be implemented here.
import neo # SQLite does not access database only by file descriptor,
from .protocol import PacketMalformedError # and an OperationalError exception would be raised if a log is emitted
from .util import dump # between a rename and a reopen.
from .handler import EventHandler # Fortunately, SQLite allow multiple process to access the same DB,
from .profiling import profiler_decorator # so an external tool should be able to dump and empty tables.
LOGGER_ENABLED = False from binascii import b2a_hex
from collections import deque
from functools import wraps
from logging import getLogger, Formatter, Logger, LogRecord, StreamHandler, \
DEBUG, WARNING
from time import time
from traceback import format_exception
import neo, os, signal, sqlite3, threading
class PacketLogger(object): # Stats for storage node of matrix test (py2.7:SQLite)
""" Logger at packet level (for debugging purpose) """ RECORD_SIZE = ( 234360832 # extra memory used
- 16777264 # sum of raw data ('msg' attribute)
) // 187509 # number of records
FMT = ('%(asctime)s %(levelname)-9s %(name)-10s'
' [%(module)14s:%(lineno)3d] \n%(message)s')
class _Formatter(Formatter):
def formatTime(self, record, datefmt=None):
return Formatter.formatTime(self, record,
'%Y-%m-%d %H:%M:%S') + '.%04d' % (record.msecs * 10)
def format(self, record):
lines = iter(Formatter.format(self, record).splitlines())
prefix = lines.next()
return '\n'.join(prefix + line for line in lines)
class PacketRecord(object):
args = None
levelno = DEBUG
__init__ = property(lambda self: self.__dict__.update)
class logging(Logger):
default_root_handler = StreamHandler()
default_root_handler.setFormatter(_Formatter(FMT))
def __init__(self): def __init__(self):
self.enable(LOGGER_ENABLED) Logger.__init__(self, None)
self.parent = root = getLogger()
def enable(self, enabled): if not root.handlers:
self.dispatch = enabled and self._dispatch or (lambda *args, **kw: None) root.addHandler(self.default_root_handler)
self.db = None
def _dispatch(self, conn, packet, outgoing): self._record_queue = deque()
"""This is a helper method to handle various packet types.""" self._record_size = 0
# default log message self._async = set()
uuid = dump(conn.getUUID()) l = threading.Lock()
ip, port = conn.getAddress() self._acquire = l.acquire
packet_name = packet.__class__.__name__ release = l.release
neo.lib.logging.debug('#0x%04x %-30s %s %s (%s:%d) %s', packet.getId(), def _release():
packet_name, outgoing and '>' or '<', uuid, ip, port, try:
b64encode(packet._body[:96])) while self._async:
# look for custom packet logger self._async.pop()(self)
logger = getattr(self, packet.handler_method_name, None) finally:
if logger is None: release()
self._release = _release
self.backlog()
def __async(wrapped):
def wrapper(self):
self._async.add(wrapped)
if self._acquire(0):
self._release()
return wraps(wrapped)(wrapper)
@__async
def flush(self):
if self.db is None:
return return
# enhanced log self.db.execute("BEGIN")
for r in self._record_queue:
self._emit(r)
self.db.commit()
self._record_queue.clear()
self._record_size = 0
def backlog(self, max_size=1<<24):
self._acquire()
try: try:
args = packet.decode() or () self._max_size = max_size
except PacketMalformedError: if max_size is None:
neo.lib.logging.warning("Can't decode packet for logging") self.flush()
return else:
log_message = logger(conn, *args) q = self._record_queue
if log_message is not None: while max_size < self._record_size:
neo.lib.logging.debug('#0x%04x %s', packet.getId(), log_message) self._record_size -= RECORD_SIZE + len(q.popleft().msg)
finally:
self._release()
def setup(self, filename=None, reset=False):
self._acquire()
try:
if self.db is not None:
self.db.close()
if not filename:
self.db = None
self._record_queue.clear()
self._record_size = 0
return
if filename:
self.db = sqlite3.connect(filename, isolation_level=None,
check_same_thread=False)
q = self.db.execute
if reset:
for t in 'log', 'packet':
q('DROP TABLE IF EXISTS ' + t)
q("""CREATE TABLE IF NOT EXISTS log (
date REAL NOT NULL,
name TEXT,
level INTEGER NOT NULL,
pathname TEXT,
lineno INTEGER,
msg TEXT)
""")
q("""CREATE INDEX IF NOT EXISTS _log_i1 ON log(date)""")
q("""CREATE TABLE IF NOT EXISTS packet (
date REAL NOT NULL,
name TEXT,
msg_id INTEGER NOT NULL,
code INTEGER NOT NULL,
peer TEXT NOT NULL,
body BLOB)
""")
q("""CREATE INDEX IF NOT EXISTS _packet_i1 ON packet(date)""")
finally:
self._release()
__del__ = setup
def error(self, conn, code, message): def isEnabledFor(self, level):
return "%s (%s)" % (code, message) return True
def notifyNodeInformation(self, conn, node_list): def _emit(self, r):
for node_type, address, uuid, state in node_list: if type(r) is PacketRecord:
if address is not None: ip, port = r.addr
address = '%s:%d' % address peer = '%s %s (%s:%u)' % ('>' if r.outgoing else '<',
r.uuid and b2a_hex(r.uuid), ip, port)
self.db.execute("INSERT INTO packet VALUES (?,?,?,?,?,?)",
(r.created, r._name, r.msg_id, r.code, peer, buffer(r.msg)))
else:
pathname = os.path.relpath(r.pathname, *neo.__path__)
self.db.execute("INSERT INTO log VALUES (?,?,?,?,?,?)",
(r.created, r._name, r.levelno, pathname, r.lineno, r.msg))
def _queue(self, record):
record._name = self.name and str(self.name)
self._acquire()
try:
if self._max_size is None:
self._emit(record)
else: else:
address = '?' self._record_size += RECORD_SIZE + len(record.msg)
node = (dump(uuid), node_type, address, state) q = self._record_queue
neo.lib.logging.debug(' ! %s | %8s | %22s | %s' % node) q.append(record)
if record.levelno < WARNING:
while self._max_size < self._record_size:
self._record_size -= RECORD_SIZE + len(q.popleft().msg)
else:
self.flush()
finally:
self._release()
def callHandlers(self, record):
if self.db is not None:
record.msg = record.getMessage()
record.args = None
if record.exc_info:
record.msg += '\n' + ''.join(
format_exception(*record.exc_info)).strip()
record.exc_info = None
self._queue(record)
if Logger.isEnabledFor(self, record.levelno):
record.name = self.name or 'NEO'
self.parent.callHandlers(record)
def packet(self, connection, packet, outgoing):
if self.db is not None:
ip, port = connection.getAddress()
self._queue(PacketRecord(
created=time(),
msg_id=packet._id,
code=packet._code,
outgoing=outgoing,
uuid=connection.getUUID(),
addr=connection.getAddress(),
msg=packet._body))
PACKET_LOGGER = PacketLogger() logging = logging()
signal.signal(signal.SIGRTMIN, lambda signum, frame: logging.flush())
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# #
# neoadmin - run an administrator node of NEO # neoadmin - run an administrator node of NEO
# #
# Copyright (C) 2009 Nexedi SA # Copyright (C) 2009-2012 Nexedi SA
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
...@@ -18,26 +18,22 @@ ...@@ -18,26 +18,22 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from optparse import OptionParser from optparse import OptionParser
from neo.lib import setupLog from neo.lib import logging
from neo.lib.config import ConfigurationManager from neo.lib.config import ConfigurationManager
parser = OptionParser() parser = OptionParser()
parser.add_option('-u', '--uuid', help='specify an UUID to use for this ' \ parser.add_option('-u', '--uuid', help='specify an UUID to use for this ' \
'process') 'process')
parser.add_option('-v', '--verbose', action = 'store_true',
help = 'print verbose messages')
parser.add_option('-f', '--file', help = 'specify a configuration file') parser.add_option('-f', '--file', help = 'specify a configuration file')
parser.add_option('-s', '--section', help = 'specify a configuration section') parser.add_option('-s', '--section', help = 'specify a configuration section')
parser.add_option('-l', '--logfile', help = 'specify a logging file') parser.add_option('-l', '--logfile', help = 'specify a logging file')
parser.add_option('-c', '--cluster', help = 'the cluster name') parser.add_option('-c', '--cluster', help = 'the cluster name')
parser.add_option('-m', '--masters', help = 'master node list') parser.add_option('-m', '--masters', help = 'master node list')
parser.add_option('-b', '--bind', help = 'the local address to bind to') parser.add_option('-b', '--bind', help = 'the local address to bind to')
parser.add_option('-n', '--name', help = 'the node name (improve logging)')
parser.add_option('-D', '--dynamic-master-list', help='path of the file ' parser.add_option('-D', '--dynamic-master-list', help='path of the file '
'containing dynamic master node list') 'containing dynamic master node list')
defaults = dict( defaults = dict(
name = 'admin',
bind = '127.0.0.1:9999', bind = '127.0.0.1:9999',
masters = '127.0.0.1:10000', masters = '127.0.0.1:10000',
) )
...@@ -47,7 +43,6 @@ def main(args=None): ...@@ -47,7 +43,6 @@ def main(args=None):
(options, args) = parser.parse_args(args=args) (options, args) = parser.parse_args(args=args)
arguments = dict( arguments = dict(
uuid = options.uuid, uuid = options.uuid,
name = options.name or options.section,
cluster = options.cluster, cluster = options.cluster,
masters = options.masters, masters = options.masters,
bind = options.bind, bind = options.bind,
...@@ -61,7 +56,7 @@ def main(args=None): ...@@ -61,7 +56,7 @@ def main(args=None):
) )
# setup custom logging # setup custom logging
setupLog(config.getName().upper(), options.logfile or None, options.verbose) logging.setup(options.logfile)
# and then, load and run the application # and then, load and run the application
from neo.admin.app import Application from neo.admin.app import Application
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# #
# neoadmin - run an administrator node of NEO # neoadmin - run an administrator node of NEO
# #
# Copyright (C) 2009 Nexedi SA # Copyright (C) 2009-2012 Nexedi SA
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
...@@ -19,15 +19,14 @@ ...@@ -19,15 +19,14 @@
import sys import sys
from optparse import OptionParser from optparse import OptionParser
from neo.lib import setupLog from neo.lib import logging
from neo.lib.util import parseNodeAddress from neo.lib.util import parseNodeAddress
parser = OptionParser() parser = OptionParser()
parser.add_option('-v', '--verbose', action = 'store_true',
help = 'print verbose messages')
parser.add_option('-a', '--address', help = 'specify the address (ip:port) ' \ parser.add_option('-a', '--address', help = 'specify the address (ip:port) ' \
'of an admin node', default = '127.0.0.1:9999') 'of an admin node', default = '127.0.0.1:9999')
parser.add_option('--handler', help = 'specify the connection handler') parser.add_option('--handler', help = 'specify the connection handler')
parser.add_option('-l', '--logfile', help = 'specify a logging file')
def main(args=None): def main(args=None):
(options, args) = parser.parse_args(args=args) (options, args) = parser.parse_args(args=args)
...@@ -36,7 +35,7 @@ def main(args=None): ...@@ -36,7 +35,7 @@ def main(args=None):
else: else:
address = ('127.0.0.1', 9999) address = ('127.0.0.1', 9999)
setupLog('NEOCTL', options.verbose) logging.setup(options.logfile)
from neo.neoctl.app import Application from neo.neoctl.app import Application
print Application(address).execute(args) print Application(address).execute(args)
......
#!/usr/bin/env python
#
# neostorage - run a storage node of NEO
#
# Copyright (C) 2012 Nexedi SA
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import logging, os, sqlite3, sys, time
from neo.lib.protocol import Packets, PacketMalformedError
from neo.lib.util import dump
def emit(date, name, levelname, msg_list):
d = int(date)
prefix = '%s.%04u %-9s %-10s ' % (time.strftime('%F %T', time.localtime(d)),
int((date - d) * 10000), levelname,
name or default_name)
for msg in msg_list:
print prefix + msg
class packet(object):
def __new__(cls, date, name, msg_id, code, peer, body):
try:
p = Packets[code]
except KeyError:
Packets[code] = p = type('UnknownPacket[%u]' % code, (object,), {})
msg = ['#0x%04x %-30s %s' % (msg_id, p.__name__, peer)]
if body is not None:
try:
logger = getattr(cls, p.handler_method_name)
except AttributeError:
pass
else:
p = p()
p._id = msg_id
p._body = body
try:
args = p.decode()
except PacketMalformedError:
msg.append("Can't decode packet")
else:
msg += logger(*args)
emit(date, name, 'PACKET', msg)
@staticmethod
def error(code, message):
return "%s (%s)" % (code, message),
@staticmethod
def notifyNodeInformation(node_list):
for node_type, address, uuid, state in node_list:
address = '%s:%u' % address if address else '?'
yield ' ! %s | %8s | %22s | %s' % (
dump(uuid), node_type, address, state)
def main():
global default_name
db_path = sys.argv[1]
default_name, _ = os.path.splitext(os.path.basename(db_path))
db = sqlite3.connect(db_path)
nl = db.execute('select * from log')
np = db.execute('select * from packet')
try:
p = np.next()
except StopIteration:
p = None
for date, name, level, pathname, lineno, msg in nl:
try:
while p and p[0] < date:
packet(*p)
p = np.next()
except StopIteration:
p = None
emit(date, name, logging.getLevelName(level), msg.splitlines())
if p:
packet(*p)
for p in np:
packet(*p)
if __name__ == "__main__":
sys.exit(main())
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# #
# neomaster - run a master node of NEO # neomaster - run a master node of NEO
# #
# Copyright (C) 2006 Nexedi SA # Copyright (C) 2006-2012 Nexedi SA
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
...@@ -18,16 +18,13 @@ ...@@ -18,16 +18,13 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from optparse import OptionParser from optparse import OptionParser
from neo.lib import setupLog from neo.lib import logging
from neo.lib.config import ConfigurationManager from neo.lib.config import ConfigurationManager
parser = OptionParser() parser = OptionParser()
parser.add_option('-v', '--verbose', action = 'store_true',
help = 'print verbose messages')
parser.add_option('-f', '--file', help = 'specify a configuration file') parser.add_option('-f', '--file', help = 'specify a configuration file')
parser.add_option('-s', '--section', help = 'specify a configuration section') parser.add_option('-s', '--section', help = 'specify a configuration section')
parser.add_option('-u', '--uuid', help='the node UUID (testing purpose)') parser.add_option('-u', '--uuid', help='the node UUID (testing purpose)')
parser.add_option('-n', '--name', help = 'the node name (impove logging)')
parser.add_option('-b', '--bind', help = 'the local address to bind to') parser.add_option('-b', '--bind', help = 'the local address to bind to')
parser.add_option('-c', '--cluster', help = 'the cluster name') parser.add_option('-c', '--cluster', help = 'the cluster name')
parser.add_option('-m', '--masters', help = 'master node list') parser.add_option('-m', '--masters', help = 'master node list')
...@@ -38,7 +35,6 @@ parser.add_option('-D', '--dynamic-master-list', help='path of the file ' ...@@ -38,7 +35,6 @@ parser.add_option('-D', '--dynamic-master-list', help='path of the file '
'containing dynamic master node list') 'containing dynamic master node list')
defaults = dict( defaults = dict(
name = 'master',
bind = '127.0.0.1:10000', bind = '127.0.0.1:10000',
masters = '', masters = '',
replicas = 0, replicas = 0,
...@@ -51,7 +47,6 @@ def main(args=None): ...@@ -51,7 +47,6 @@ def main(args=None):
arguments = dict( arguments = dict(
uuid = options.uuid or None, uuid = options.uuid or None,
bind = options.bind, bind = options.bind,
name = options.name or options.section,
cluster = options.cluster, cluster = options.cluster,
masters = options.masters, masters = options.masters,
replicas = options.replicas, replicas = options.replicas,
...@@ -65,7 +60,7 @@ def main(args=None): ...@@ -65,7 +60,7 @@ def main(args=None):
) )
# setup custom logging # setup custom logging
setupLog(config.getName().upper(), options.logfile or None, options.verbose) logging.setup(options.logfile)
# and then, load and run the application # and then, load and run the application
from neo.master.app import Application from neo.master.app import Application
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# #
# neostorage - run a storage node of NEO # neostorage - run a storage node of NEO
# #
# Copyright (C) 2006 Nexedi SA # Copyright (C) 2006-2012 Nexedi SA
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
...@@ -18,13 +18,11 @@ ...@@ -18,13 +18,11 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from optparse import OptionParser from optparse import OptionParser
from neo.lib import setupLog from neo.lib import logging
from neo.lib.config import ConfigurationManager from neo.lib.config import ConfigurationManager
parser = OptionParser() parser = OptionParser()
parser.add_option('-v', '--verbose', action = 'store_true',
help = 'print verbose messages')
parser.add_option('-u', '--uuid', help='specify an UUID to use for this ' \ parser.add_option('-u', '--uuid', help='specify an UUID to use for this ' \
'process. Previously assigned UUID takes precedence (ie ' \ 'process. Previously assigned UUID takes precedence (ie ' \
'you should always use -R with this switch)') 'you should always use -R with this switch)')
...@@ -33,7 +31,6 @@ parser.add_option('-s', '--section', help = 'specify a configuration section') ...@@ -33,7 +31,6 @@ parser.add_option('-s', '--section', help = 'specify a configuration section')
parser.add_option('-l', '--logfile', help = 'specify a logging file') parser.add_option('-l', '--logfile', help = 'specify a logging file')
parser.add_option('-R', '--reset', action = 'store_true', parser.add_option('-R', '--reset', action = 'store_true',
help = 'remove an existing database if any') help = 'remove an existing database if any')
parser.add_option('-n', '--name', help = 'the node name (impove logging)')
parser.add_option('-b', '--bind', help = 'the local address to bind to') parser.add_option('-b', '--bind', help = 'the local address to bind to')
parser.add_option('-c', '--cluster', help = 'the cluster name') parser.add_option('-c', '--cluster', help = 'the cluster name')
parser.add_option('-m', '--masters', help = 'master node list') parser.add_option('-m', '--masters', help = 'master node list')
...@@ -45,7 +42,6 @@ parser.add_option('-w', '--wait', help='seconds to wait for backend to be ' ...@@ -45,7 +42,6 @@ parser.add_option('-w', '--wait', help='seconds to wait for backend to be '
'available, before erroring-out (-1 = infinite)', type='float', default=0) 'available, before erroring-out (-1 = infinite)', type='float', default=0)
defaults = dict( defaults = dict(
name = 'storage',
bind = '127.0.0.1', bind = '127.0.0.1',
masters = '127.0.0.1:10000', masters = '127.0.0.1:10000',
adapter = 'MySQL', adapter = 'MySQL',
...@@ -60,7 +56,6 @@ def main(args=None): ...@@ -60,7 +56,6 @@ def main(args=None):
arguments = dict( arguments = dict(
uuid = options.uuid, uuid = options.uuid,
bind = options.bind, bind = options.bind,
name = options.name or options.section,
cluster = options.cluster, cluster = options.cluster,
masters = options.masters, masters = options.masters,
database = options.database, database = options.database,
...@@ -76,7 +71,7 @@ def main(args=None): ...@@ -76,7 +71,7 @@ def main(args=None):
) )
# setup custom logging # setup custom logging
setupLog(config.getName().upper(), options.logfile or None, options.verbose) logging.setup(options.logfile)
# and then, load and run the application # and then, load and run the application
from neo.storage.app import Application from neo.storage.app import Application
......
#!/usr/bin/env python #!/usr/bin/env python
# #
# Copyright (C) 2009 Nexedi SA # Copyright (C) 2009-2012 Nexedi SA
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
......
#!/usr/bin/env python #!/usr/bin/env python
# #
# Copyright (C) 2011 Nexedi SA # Copyright (C) 2011-2012 Nexedi SA
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
...@@ -17,8 +17,10 @@ ...@@ -17,8 +17,10 @@
import inspect, random, signal, sys import inspect, random, signal, sys
from optparse import OptionParser from optparse import OptionParser
from neo.lib import logger, logging from neo.lib import logging
from neo.tests import functional from neo.tests import functional
logging.backlog()
del logging.default_root_handler.handle
def main(): def main():
args, _, _, defaults = inspect.getargspec(functional.NEOCluster.__init__) args, _, _, defaults = inspect.getargspec(functional.NEOCluster.__init__)
...@@ -40,8 +42,6 @@ def main(): ...@@ -40,8 +42,6 @@ def main():
parser.add_option('--' + option, **kw) parser.add_option('--' + option, **kw)
parser.set_defaults(**defaults) parser.set_defaults(**defaults)
options, args = parser.parse_args() options, args = parser.parse_args()
if options.verbose:
logger.PACKET_LOGGER.enable(True)
if options.seed: if options.seed:
functional.random = random.Random(options.seed) functional.random = random.Random(options.seed)
cluster = functional.NEOCluster(args, **dict((x, getattr(options, x)) cluster = functional.NEOCluster(args, **dict((x, getattr(options, x))
......
...@@ -22,11 +22,10 @@ import sys ...@@ -22,11 +22,10 @@ import sys
import tempfile import tempfile
import unittest import unittest
import MySQLdb import MySQLdb
import neo
import transaction import transaction
from mock import Mock from mock import Mock
from neo.lib import debug, logger, protocol, setupLog from neo.lib import debug, logging, protocol
from neo.lib.protocol import Packets from neo.lib.protocol import Packets
from neo.lib.util import getAddressType from neo.lib.util import getAddressType
from time import time, gmtime from time import time, gmtime
...@@ -44,10 +43,12 @@ IP_VERSION_FORMAT_DICT = { ...@@ -44,10 +43,12 @@ IP_VERSION_FORMAT_DICT = {
ADDRESS_TYPE = socket.AF_INET ADDRESS_TYPE = socket.AF_INET
debug.ENABLED = True logging.default_root_handler.handle = lambda record: None
logging.backlog(None)
debug.register() debug.register()
# prevent "signal only works in main thread" errors in subprocesses # prevent "signal only works in main thread" errors in subprocesses
debug.ENABLED = False debug.register = lambda on_log=None: None
def mockDefaultValue(name, function): def mockDefaultValue(name, function):
def method(self, *args, **kw): def method(self, *args, **kw):
...@@ -109,30 +110,31 @@ def setupMySQLdb(db_list, user=DB_USER, password='', clear_databases=True): ...@@ -109,30 +110,31 @@ def setupMySQLdb(db_list, user=DB_USER, password='', clear_databases=True):
conn.close() conn.close()
class NeoTestBase(unittest.TestCase): class NeoTestBase(unittest.TestCase):
def setUp(self): def setUp(self):
logger.PACKET_LOGGER.enable(True)
sys.stdout.write(' * %s ' % (self.id(), )) sys.stdout.write(' * %s ' % (self.id(), ))
sys.stdout.flush() sys.stdout.flush()
self.setupLog() logging.name = self.setupLog()
unittest.TestCase.setUp(self) unittest.TestCase.setUp(self)
def setupLog(self): def setupLog(self):
test_case, test_method = self.id().rsplit('.', 1) test_case, logging.name = self.id().rsplit('.', 1)
log_file = os.path.join(getTempDirectory(), test_case + '.log') logging.setup(os.path.join(getTempDirectory(), test_case + '.log'))
setupLog(test_method, log_file, True)
def tearDown(self): def tearDown(self, success='ok' if sys.version_info < (2,7) else 'success'):
assert self.tearDown.im_func is NeoTestBase.tearDown.im_func
self._tearDown(sys._getframe(1).f_locals[success])
def _tearDown(self, success):
# Kill all unfinished transactions for next test. # Kill all unfinished transactions for next test.
# Note we don't even abort them because it may require a valid # Note we don't even abort them because it may require a valid
# connection to a master node (see Storage.sync()). # connection to a master node (see Storage.sync()).
transaction.manager.__init__() transaction.manager.__init__()
unittest.TestCase.tearDown(self) print
sys.stdout.write('\n')
sys.stdout.flush()
class failureException(AssertionError): class failureException(AssertionError):
def __init__(self, msg=None): def __init__(self, msg=None):
neo.lib.logging.error(msg) logging.error(msg)
AssertionError.__init__(self, msg) AssertionError.__init__(self, msg)
failIfEqual = failUnlessEqual = assertEquals = assertNotEquals = None failIfEqual = failUnlessEqual = assertEquals = assertNotEquals = None
...@@ -180,7 +182,6 @@ class NeoUnitTestBase(NeoTestBase): ...@@ -180,7 +182,6 @@ class NeoUnitTestBase(NeoTestBase):
database = '%s@%s%s' % (DB_USER, prefix, index) database = '%s@%s%s' % (DB_USER, prefix, index)
return Mock({ return Mock({
'getCluster': cluster, 'getCluster': cluster,
'getName': 'storage',
'getBind': (masters[0], 10020 + index), 'getBind': (masters[0], 10020 + index),
'getMasters': (masters, getAddressType(( 'getMasters': (masters, getAddressType((
self.local_ip, 0))), self.local_ip, 0))),
...@@ -510,7 +511,7 @@ connector_cpt = 0 ...@@ -510,7 +511,7 @@ connector_cpt = 0
class DoNothingConnector(Mock): class DoNothingConnector(Mock):
def __init__(self, s=None): def __init__(self, s=None):
neo.lib.logging.info("initializing connector") logging.info("initializing connector")
global connector_cpt global connector_cpt
self.desc = connector_cpt self.desc = connector_cpt
connector_cpt += 1 connector_cpt += 1
......
...@@ -8,10 +8,11 @@ import datetime ...@@ -8,10 +8,11 @@ import datetime
from email.MIMEMultipart import MIMEMultipart from email.MIMEMultipart import MIMEMultipart
from email.MIMEText import MIMEText from email.MIMEText import MIMEText
from neo.lib import logger
MAIL_SERVER = '127.0.0.1:25' MAIL_SERVER = '127.0.0.1:25'
from neo.lib import logging
logging.backlog()
class AttributeDict(dict): class AttributeDict(dict):
def __getattr__(self, item): def __getattr__(self, item):
...@@ -28,7 +29,6 @@ class BenchmarkRunner(object): ...@@ -28,7 +29,6 @@ class BenchmarkRunner(object):
parser = optparse.OptionParser() parser = optparse.OptionParser()
# register common options # register common options
parser.add_option('', '--title') parser.add_option('', '--title')
parser.add_option('-v', '--verbose', action='store_true')
parser.add_option('', '--mail-to', action='append') parser.add_option('', '--mail-to', action='append')
parser.add_option('', '--mail-from') parser.add_option('', '--mail-from')
parser.add_option('', '--mail-server') parser.add_option('', '--mail-server')
...@@ -44,7 +44,6 @@ class BenchmarkRunner(object): ...@@ -44,7 +44,6 @@ class BenchmarkRunner(object):
self._config.update(self.load_options(options, self._args)) self._config.update(self.load_options(options, self._args))
self._config.update( self._config.update(
title = options.title or self.__class__.__name__, title = options.title or self.__class__.__name__,
verbose = bool(options.verbose),
mail_from = options.mail_from, mail_from = options.mail_from,
mail_to = options.mail_to, mail_to = options.mail_to,
mail_server = mail_server.split(':'), mail_server = mail_server.split(':'),
...@@ -93,7 +92,6 @@ class BenchmarkRunner(object): ...@@ -93,7 +92,6 @@ class BenchmarkRunner(object):
s.close() s.close()
def run(self): def run(self):
logger.PACKET_LOGGER.enable(self._config.verbose)
subject, report = self.start() subject, report = self.start()
report = self.build_report(report) report = self.build_report(report)
if self._config.mail_to: if self._config.mail_to:
......
...@@ -77,7 +77,7 @@ class ClientApplicationTests(NeoUnitTestBase): ...@@ -77,7 +77,7 @@ class ClientApplicationTests(NeoUnitTestBase):
Application.getPartitionTable = getPartitionTable Application.getPartitionTable = getPartitionTable
self._to_stop_list = [] self._to_stop_list = []
def tearDown(self): def _tearDown(self, success):
# stop threads # stop threads
for app in self._to_stop_list: for app in self._to_stop_list:
app.close() app.close()
...@@ -85,7 +85,7 @@ class ClientApplicationTests(NeoUnitTestBase): ...@@ -85,7 +85,7 @@ class ClientApplicationTests(NeoUnitTestBase):
Application._getMasterConnection = self._getMasterConnection Application._getMasterConnection = self._getMasterConnection
Application._ask = self._ask Application._ask = self._ask
Application.getPartitionTable = self.getPartitionTable Application.getPartitionTable = self.getPartitionTable
NeoUnitTestBase.tearDown(self) NeoUnitTestBase._tearDown(self, success)
# some helpers # some helpers
......
...@@ -288,4 +288,5 @@ class ClusterPdb(object): ...@@ -288,4 +288,5 @@ class ClusterPdb(object):
__builtin__.pdb = ClusterPdb() __builtin__.pdb = ClusterPdb()
signal.signal(signal.SIGUSR2, debug.decorate(lambda sig, frame: pdb(depth=2))) signal.signal(signal.SIGUSR1, debug.safe_handler(
lambda sig, frame: pdb(depth=2)))
...@@ -33,7 +33,6 @@ import psutil ...@@ -33,7 +33,6 @@ import psutil
import neo.scripts import neo.scripts
from neo.neoctl.neoctl import NeoCTL, NotReadyException from neo.neoctl.neoctl import NeoCTL, NotReadyException
from neo.lib import setupLog
from neo.lib.protocol import ClusterStates, NodeTypes, CellStates, NodeStates from neo.lib.protocol import ClusterStates, NodeTypes, CellStates, NodeStates
from neo.lib.util import dump from neo.lib.util import dump
from .. import DB_USER, setupMySQLdb, NeoTestBase, buildUrlFromString, \ from .. import DB_USER, setupMySQLdb, NeoTestBase, buildUrlFromString, \
...@@ -171,6 +170,8 @@ class NEOProcess(object): ...@@ -171,6 +170,8 @@ class NEOProcess(object):
# prevent child from killing anything # prevent child from killing anything
del self.__class__.__del__ del self.__class__.__del__
try: try:
# release SQLite debug log
neo.lib.logging.setup()
# release system-wide lock # release system-wide lock
for allocator in PortAllocator.allocator_set.copy(): for allocator in PortAllocator.allocator_set.copy():
allocator.reset() allocator.reset()
...@@ -243,7 +244,6 @@ class NEOCluster(object): ...@@ -243,7 +244,6 @@ class NEOCluster(object):
db_user=DB_USER, db_password='', db_user=DB_USER, db_password='',
cleanup_on_delete=False, temp_dir=None, clear_databases=True, cleanup_on_delete=False, temp_dir=None, clear_databases=True,
adapter=os.getenv('NEO_TESTS_ADAPTER'), adapter=os.getenv('NEO_TESTS_ADAPTER'),
verbose=True,
address_type=ADDRESS_TYPE, address_type=ADDRESS_TYPE,
): ):
if not adapter: if not adapter:
...@@ -251,7 +251,6 @@ class NEOCluster(object): ...@@ -251,7 +251,6 @@ class NEOCluster(object):
self.adapter = adapter self.adapter = adapter
self.zodb_storage_list = [] self.zodb_storage_list = []
self.cleanup_on_delete = cleanup_on_delete self.cleanup_on_delete = cleanup_on_delete
self.verbose = verbose
self.uuid_set = set() self.uuid_set = set()
self.db_list = db_list self.db_list = db_list
if temp_dir is None: if temp_dir is None:
...@@ -282,16 +281,16 @@ class NEOCluster(object): ...@@ -282,16 +281,16 @@ class NEOCluster(object):
# create admin node # create admin node
self.__newProcess(NEO_ADMIN, { self.__newProcess(NEO_ADMIN, {
'--cluster': self.cluster_name, '--cluster': self.cluster_name,
'--name': 'admin', '--logfile': os.path.join(self.temp_dir, 'admin.log'),
'--bind': '%s:%d' % (buildUrlFromString( '--bind': '%s:%d' % (buildUrlFromString(
self.local_ip), admin_port, ), self.local_ip), admin_port, ),
'--masters': self.master_nodes, '--masters': self.master_nodes,
}) })
# create master nodes # create master nodes
for index, port in enumerate(master_node_list): for i, port in enumerate(master_node_list):
self.__newProcess(NEO_MASTER, { self.__newProcess(NEO_MASTER, {
'--cluster': self.cluster_name, '--cluster': self.cluster_name,
'--name': 'master_%d' % index, '--logfile': os.path.join(self.temp_dir, 'master_%u.log' % i),
'--bind': '%s:%d' % (buildUrlFromString( '--bind': '%s:%d' % (buildUrlFromString(
self.local_ip), port, ), self.local_ip), port, ),
'--masters': self.master_nodes, '--masters': self.master_nodes,
...@@ -299,10 +298,10 @@ class NEOCluster(object): ...@@ -299,10 +298,10 @@ class NEOCluster(object):
'--partitions': partitions, '--partitions': partitions,
}) })
# create storage nodes # create storage nodes
for index, db in enumerate(db_list): for i, db in enumerate(db_list):
self.__newProcess(NEO_STORAGE, { self.__newProcess(NEO_STORAGE, {
'--cluster': self.cluster_name, '--cluster': self.cluster_name,
'--name': 'storage_%d' % index, '--logfile': os.path.join(self.temp_dir, 'storage_%u.log' % i),
'--bind': '%s:%d' % (buildUrlFromString( '--bind': '%s:%d' % (buildUrlFromString(
self.local_ip), self.local_ip),
0 ), 0 ),
...@@ -316,11 +315,6 @@ class NEOCluster(object): ...@@ -316,11 +315,6 @@ class NEOCluster(object):
def __newProcess(self, command, arguments): def __newProcess(self, command, arguments):
uuid = self.__allocateUUID() uuid = self.__allocateUUID()
arguments['--uuid'] = uuid arguments['--uuid'] = uuid
if self.verbose:
arguments['--verbose'] = True
logfile = arguments['--name']
arguments['--logfile'] = os.path.join(self.temp_dir, '%s.log' % (logfile, ))
self.process_dict.setdefault(command, []).append( self.process_dict.setdefault(command, []).append(
NEOProcess(command, uuid, arguments)) NEOProcess(command, uuid, arguments))
...@@ -419,8 +413,6 @@ class NEOCluster(object): ...@@ -419,8 +413,6 @@ class NEOCluster(object):
result = Storage( result = Storage(
master_nodes=master_nodes, master_nodes=master_nodes,
name=self.cluster_name, name=self.cluster_name,
logfile=os.path.join(self.temp_dir, 'client.log'),
verbose=self.verbose,
**kw) **kw)
self.zodb_storage_list.append(result) self.zodb_storage_list.append(result)
return result return result
...@@ -649,8 +641,7 @@ class NEOCluster(object): ...@@ -649,8 +641,7 @@ class NEOCluster(object):
class NEOFunctionalTest(NeoTestBase): class NEOFunctionalTest(NeoTestBase):
def setupLog(self): def setupLog(self):
log_file = os.path.join(self.getTempDirectory(), 'test.log') neo.lib.logging.setup(os.path.join(self.getTempDirectory(), 'test.log'))
setupLog('TEST', log_file, True)
def getTempDirectory(self): def getTempDirectory(self):
# build the full path based on test case and current test method # build the full path based on test case and current test method
......
...@@ -76,10 +76,10 @@ class ClientTests(NEOFunctionalTest): ...@@ -76,10 +76,10 @@ class ClientTests(NEOFunctionalTest):
temp_dir=self.getTempDirectory() temp_dir=self.getTempDirectory()
) )
def tearDown(self): def _tearDown(self, success):
if self.neo is not None: if self.neo is not None:
self.neo.stop() self.neo.stop()
NEOFunctionalTest.tearDown(self) NEOFunctionalTest._tearDown(self, success)
def __setup(self): def __setup(self):
# start cluster # start cluster
......
...@@ -27,10 +27,10 @@ class ClusterTests(NEOFunctionalTest): ...@@ -27,10 +27,10 @@ class ClusterTests(NEOFunctionalTest):
NEOFunctionalTest.setUp(self) NEOFunctionalTest.setUp(self)
self.neo = None self.neo = None
def tearDown(self): def _tearDown(self, success):
if self.neo is not None: if self.neo is not None:
self.neo.stop() self.neo.stop()
NEOFunctionalTest.tearDown(self) NEOFunctionalTest._tearDown(self, success)
def testClusterStartup(self): def testClusterStartup(self):
neo = NEOCluster(['test_neo1', 'test_neo2'], replicas=1, neo = NEOCluster(['test_neo1', 'test_neo2'], replicas=1,
......
...@@ -32,9 +32,9 @@ class MasterTests(NEOFunctionalTest): ...@@ -32,9 +32,9 @@ class MasterTests(NEOFunctionalTest):
self.storage = self.neo.getZODBStorage() self.storage = self.neo.getZODBStorage()
self.neoctl = self.neo.getNEOCTL() self.neoctl = self.neo.getNEOCTL()
def tearDown(self): def _tearDown(self, success):
self.neo.stop() self.neo.stop()
NEOFunctionalTest.tearDown(self) NEOFunctionalTest._tearDown(self, success)
def testStoppingSecondaryMaster(self): def testStoppingSecondaryMaster(self):
# Wait for masters to stabilize # Wait for masters to stabilize
......
...@@ -39,10 +39,10 @@ class StorageTests(NEOFunctionalTest): ...@@ -39,10 +39,10 @@ class StorageTests(NEOFunctionalTest):
NEOFunctionalTest.setUp(self) NEOFunctionalTest.setUp(self)
self.neo = None self.neo = None
def tearDown(self): def _tearDown(self, success):
if self.neo is not None: if self.neo is not None:
self.neo.stop() self.neo.stop()
NEOFunctionalTest.tearDown(self) NEOFunctionalTest._tearDown(self, success)
def queryCount(self, db, query): def queryCount(self, db, query):
try: try:
......
...@@ -70,10 +70,10 @@ class MasterClientElectionTests(MasterClientElectionTestBase): ...@@ -70,10 +70,10 @@ class MasterClientElectionTests(MasterClientElectionTestBase):
ClientConnection._addPacket = _addPacket ClientConnection._addPacket = _addPacket
super(MasterClientElectionTests, self).setUp() super(MasterClientElectionTests, self).setUp()
def tearDown(self): def _tearDown(self, success):
# restore patched methods # restore patched methods
ClientConnection._addPacket = self._addPacket ClientConnection._addPacket = self._addPacket
NeoUnitTestBase.tearDown(self) NeoUnitTestBase._tearDown(self, success)
def _checkUnconnected(self, node): def _checkUnconnected(self, node):
addr = node.getAddress() addr = node.getAddress()
...@@ -233,8 +233,8 @@ class MasterServerElectionTests(MasterClientElectionTestBase): ...@@ -233,8 +233,8 @@ class MasterServerElectionTests(MasterClientElectionTestBase):
ClientConnection._addPacket = _addPacket ClientConnection._addPacket = _addPacket
super(MasterServerElectionTests, self).setUp() super(MasterServerElectionTests, self).setUp()
def tearDown(self): def _tearDown(self, success):
NeoUnitTestBase.tearDown(self) NeoUnitTestBase._tearDown(self, success)
# restore environnement # restore environnement
ClientConnection._addPacket = self._addPacket ClientConnection._addPacket = self._addPacket
......
...@@ -55,10 +55,10 @@ class StorageClientHandlerTests(NeoUnitTestBase): ...@@ -55,10 +55,10 @@ class StorageClientHandlerTests(NeoUnitTestBase):
self.app.primary_master_node = pmn self.app.primary_master_node = pmn
self.master_port = 10010 self.master_port = 10010
def tearDown(self): def _tearDown(self, success):
self.app.close() self.app.close()
del self.app del self.app
super(StorageClientHandlerTests, self).tearDown() super(StorageClientHandlerTests, self)._tearDown(success)
def _getConnection(self, uuid=None): def _getConnection(self, uuid=None):
return self.getFakeConnection(uuid=uuid, address=('127.0.0.1', 1000)) return self.getFakeConnection(uuid=uuid, address=('127.0.0.1', 1000))
......
...@@ -34,10 +34,10 @@ class StorageIdentificationHandlerTests(NeoUnitTestBase): ...@@ -34,10 +34,10 @@ class StorageIdentificationHandlerTests(NeoUnitTestBase):
self.app.pt = PartitionTable(4, 1) self.app.pt = PartitionTable(4, 1)
self.identification = IdentificationHandler(self.app) self.identification = IdentificationHandler(self.app)
def tearDown(self): def _tearDown(self, success):
self.app.close() self.app.close()
del self.app del self.app
super(StorageIdentificationHandlerTests, self).tearDown() super(StorageIdentificationHandlerTests, self)._tearDown(success)
def test_requestIdentification1(self): def test_requestIdentification1(self):
""" nodes are rejected during election or if unknown storage """ """ nodes are rejected during election or if unknown storage """
......
...@@ -42,10 +42,10 @@ class StorageInitializationHandlerTests(NeoUnitTestBase): ...@@ -42,10 +42,10 @@ class StorageInitializationHandlerTests(NeoUnitTestBase):
self.app.load_lock_dict = {} self.app.load_lock_dict = {}
self.app.pt = PartitionTable(self.num_partitions, self.num_replicas) self.app.pt = PartitionTable(self.num_partitions, self.num_replicas)
def tearDown(self): def _tearDown(self, success):
self.app.close() self.app.close()
del self.app del self.app
super(StorageInitializationHandlerTests, self).tearDown() super(StorageInitializationHandlerTests, self)._tearDown(success)
# Common methods # Common methods
def getLastUUID(self): def getLastUUID(self):
......
...@@ -52,10 +52,10 @@ class StorageMasterHandlerTests(NeoUnitTestBase): ...@@ -52,10 +52,10 @@ class StorageMasterHandlerTests(NeoUnitTestBase):
self.app.primary_master_node = pmn self.app.primary_master_node = pmn
self.master_port = 10010 self.master_port = 10010
def tearDown(self): def _tearDown(self, success):
self.app.close() self.app.close()
del self.app del self.app
super(StorageMasterHandlerTests, self).tearDown() super(StorageMasterHandlerTests, self)._tearDown(success)
def getMasterConnection(self): def getMasterConnection(self):
address = ("127.0.0.1", self.master_port) address = ("127.0.0.1", self.master_port)
......
...@@ -35,10 +35,10 @@ class StorageAppTests(NeoUnitTestBase): ...@@ -35,10 +35,10 @@ class StorageAppTests(NeoUnitTestBase):
self.app.event_queue = deque() self.app.event_queue = deque()
self.app.event_queue_dict = {} self.app.event_queue_dict = {}
def tearDown(self): def _tearDown(self, success):
self.app.close() self.app.close()
del self.app del self.app
super(StorageAppTests, self).tearDown() super(StorageAppTests, self)._tearDown(success)
def test_01_loadPartitionTable(self): def test_01_loadPartitionTable(self):
self.app.dm = Mock({ self.app.dm = Mock({
......
...@@ -36,12 +36,12 @@ class StorageDBTests(NeoUnitTestBase): ...@@ -36,12 +36,12 @@ class StorageDBTests(NeoUnitTestBase):
self.setNumPartitions(1) self.setNumPartitions(1)
return self._db return self._db
def tearDown(self): def _tearDown(self, success):
try: try:
self.__dict__.pop('_db', None).close() self.__dict__.pop('_db', None).close()
except AttributeError: except AttributeError:
pass pass
NeoUnitTestBase.tearDown(self) NeoUnitTestBase._tearDown(self, success)
def getDB(self): def getDB(self):
raise NotImplementedError raise NotImplementedError
......
...@@ -43,10 +43,10 @@ class StorageVerificationHandlerTests(NeoUnitTestBase): ...@@ -43,10 +43,10 @@ class StorageVerificationHandlerTests(NeoUnitTestBase):
self.app.load_lock_dict = {} self.app.load_lock_dict = {}
self.app.pt = PartitionTable(self.num_partitions, self.num_replicas) self.app.pt = PartitionTable(self.num_partitions, self.num_replicas)
def tearDown(self): def _tearDown(self, success):
self.app.close() self.app.close()
del self.app del self.app
super(StorageVerificationHandlerTests, self).tearDown() super(StorageVerificationHandlerTests, self)._tearDown(success)
# Common methods # Common methods
def getLastUUID(self): def getLastUUID(self):
......
...@@ -36,10 +36,10 @@ class BootstrapManagerTests(NeoUnitTestBase): ...@@ -36,10 +36,10 @@ class BootstrapManagerTests(NeoUnitTestBase):
self.num_partitions = 1009 self.num_partitions = 1009
self.num_replicas = 2 self.num_replicas = 2
def tearDown(self): def _tearDown(self, success):
self.app.close() self.app.close()
del self.app del self.app
super(BootstrapManagerTests, self).tearDown() super(BootstrapManagerTests, self)._tearDown(success)
# Common methods # Common methods
def getLastUUID(self): def getLastUUID(self):
......
...@@ -25,7 +25,7 @@ from . import DoNothingConnector ...@@ -25,7 +25,7 @@ from . import DoNothingConnector
from neo.lib.connector import ConnectorException, ConnectorTryAgainException, \ from neo.lib.connector import ConnectorException, ConnectorTryAgainException, \
ConnectorInProgressException, ConnectorConnectionRefusedException ConnectorInProgressException, ConnectorConnectionRefusedException
from neo.lib.handler import EventHandler from neo.lib.handler import EventHandler
from neo.lib.protocol import Packets, ParserState from neo.lib.protocol import Packets, ParserState, PACKET_HEADER_FORMAT
from . import NeoUnitTestBase from . import NeoUnitTestBase
from neo.lib.util import ReadBuffer from neo.lib.util import ReadBuffer
from neo.lib.locking import Queue from neo.lib.locking import Queue
...@@ -406,13 +406,12 @@ class ConnectionTests(NeoUnitTestBase): ...@@ -406,13 +406,12 @@ class ConnectionTests(NeoUnitTestBase):
def test_07_Connection_addPacket(self): def test_07_Connection_addPacket(self):
# new packet # new packet
p = Mock({"encode" : "testdata", "getId": 0}) p = Packets.Ping()
p._body = '' p._id = 0
p.handler_method_name = 'testmethod'
bc = self._makeConnection() bc = self._makeConnection()
self._checkWriteBuf(bc, '') self._checkWriteBuf(bc, '')
bc._addPacket(p) bc._addPacket(p)
self._checkWriteBuf(bc, 'testdata') self._checkWriteBuf(bc, PACKET_HEADER_FORMAT.pack(0, p._code, 10))
self._checkWriterAdded(1) self._checkWriterAdded(1)
def test_Connection_analyse1(self): def test_Connection_analyse1(self):
......
...@@ -25,7 +25,7 @@ import transaction, ZODB ...@@ -25,7 +25,7 @@ import transaction, ZODB
import neo.admin.app, neo.master.app, neo.storage.app import neo.admin.app, neo.master.app, neo.storage.app
import neo.client.app, neo.neoctl.app import neo.client.app, neo.neoctl.app
from neo.client import Storage from neo.client import Storage
from neo.lib import bootstrap, setupLog from neo.lib import bootstrap
from neo.lib.connection import BaseConnection, Connection from neo.lib.connection import BaseConnection, Connection
from neo.lib.connector import SocketConnector, \ from neo.lib.connector import SocketConnector, \
ConnectorConnectionRefusedException, ConnectorTryAgainException ConnectorConnectionRefusedException, ConnectorTryAgainException
...@@ -518,7 +518,6 @@ class NEOCluster(object): ...@@ -518,7 +518,6 @@ class NEOCluster(object):
cls.SocketConnector_makeListeningConnection(self, BIND) cls.SocketConnector_makeListeningConnection(self, BIND)
SocketConnector.receive = receive SocketConnector.receive = receive
SocketConnector.send = send SocketConnector.send = send
Storage.setupLog = lambda *args, **kw: None
Serialized.init() Serialized.init()
@staticmethod @staticmethod
...@@ -536,19 +535,11 @@ class NEOCluster(object): ...@@ -536,19 +535,11 @@ class NEOCluster(object):
cls.SocketConnector_makeListeningConnection cls.SocketConnector_makeListeningConnection
SocketConnector.receive = cls.SocketConnector_receive SocketConnector.receive = cls.SocketConnector_receive
SocketConnector.send = cls.SocketConnector_send SocketConnector.send = cls.SocketConnector_send
Storage.setupLog = setupLog
def __init__(self, master_count=1, partitions=1, replicas=0, upstream=None, def __init__(self, master_count=1, partitions=1, replicas=0, upstream=None,
adapter=os.getenv('NEO_TESTS_ADAPTER', 'SQLite'), adapter=os.getenv('NEO_TESTS_ADAPTER', 'SQLite'),
storage_count=None, db_list=None, clear_databases=True, storage_count=None, db_list=None, clear_databases=True,
db_user=DB_USER, db_password='', verbose=None): db_user=DB_USER, db_password=''):
if verbose is not None:
temp_dir = os.getenv('TEMP') or \
os.path.join(tempfile.gettempdir(), 'neo_tests')
os.path.exists(temp_dir) or os.makedirs(temp_dir)
log_file = tempfile.mkstemp('.log', '', temp_dir)[1]
print 'Logging to %r' % log_file
setupLog(LoggerThreadName(), log_file, verbose)
self.name = 'neo_%s' % self._allocate('name', self.name = 'neo_%s' % self._allocate('name',
lambda: random.randint(0, 100)) lambda: random.randint(0, 100))
master_list = [MasterApplication.newAddress() master_list = [MasterApplication.newAddress()
...@@ -751,11 +742,16 @@ class NEOThreadedTest(NeoTestBase): ...@@ -751,11 +742,16 @@ class NEOThreadedTest(NeoTestBase):
def setupLog(self): def setupLog(self):
log_file = os.path.join(getTempDirectory(), self.id() + '.log') log_file = os.path.join(getTempDirectory(), self.id() + '.log')
setupLog(LoggerThreadName(), log_file, True) neo.lib.logging.setup(log_file)
return LoggerThreadName()
def tearDown(self): def _tearDown(self, success):
super(NEOThreadedTest, self).tearDown() super(NEOThreadedTest, self)._tearDown(success)
ServerNode.resetPorts() ServerNode.resetPorts()
if success:
q = neo.lib.logging.db.execute
q("UPDATE packet SET body=NULL")
q("VACUUM")
def getUnpickler(self, conn): def getUnpickler(self, conn):
reader = conn._reader reader = conn._reader
......
...@@ -41,11 +41,11 @@ class ZODBTestCase(TestCase): ...@@ -41,11 +41,11 @@ class ZODBTestCase(TestCase):
self.neo.start() self.neo.start()
self._storage = self.neo.getZODBStorage() self._storage = self.neo.getZODBStorage()
def tearDown(self): def _tearDown(self, success):
self._storage.cleanup() self._storage.cleanup()
self.neo.stop() self.neo.stop()
del self.neo, self._storage del self.neo, self._storage
super(ZODBTestCase, self).tearDown() super(ZODBTestCase, self)._tearDown(success)
assertEquals = failUnlessEqual = TestCase.assertEqual assertEquals = failUnlessEqual = TestCase.assertEqual
assertNotEquals = failIfEqual = TestCase.assertNotEqual assertNotEquals = failIfEqual = TestCase.assertNotEqual
......
...@@ -39,8 +39,8 @@ class RecoveryTests(ZODBTestCase, StorageTestBase, RecoveryStorage): ...@@ -39,8 +39,8 @@ class RecoveryTests(ZODBTestCase, StorageTestBase, RecoveryStorage):
self._dst = self.neo.getZODBStorage() self._dst = self.neo.getZODBStorage()
self._dst_db = ZODB.DB(self._dst) self._dst_db = ZODB.DB(self._dst)
def tearDown(self): def _tearDown(self, success):
super(RecoveryTests, self).tearDown() super(RecoveryTests, self)._tearDown(success)
self._dst_db.close() self._dst_db.close()
self._dst.cleanup() self._dst.cleanup()
self.neo_dst.stop() self.neo_dst.stop()
......
...@@ -26,9 +26,9 @@ class NEOZODBTests(ZODBTestCase, testZODB.ZODBTests): ...@@ -26,9 +26,9 @@ class NEOZODBTests(ZODBTestCase, testZODB.ZODBTests):
super(NEOZODBTests, self).setUp() super(NEOZODBTests, self).setUp()
self._db = ZODB.DB(self._storage) self._db = ZODB.DB(self._storage)
def tearDown(self): def _tearDown(self, success):
self._db.close() self._db.close()
super(NEOZODBTests, self).tearDown() super(NEOZODBTests, self)._tearDown(success)
def checkMultipleUndoInOneTransaction(self): def checkMultipleUndoInOneTransaction(self):
# XXX: Upstream test accesses a persistent object outside a transaction # XXX: Upstream test accesses a persistent object outside a transaction
......
...@@ -55,6 +55,7 @@ setup( ...@@ -55,6 +55,7 @@ setup(
# (eg. we don't want neotestrunner if nothing depends on tests) # (eg. we don't want neotestrunner if nothing depends on tests)
'neoadmin=neo.scripts.neoadmin:main', 'neoadmin=neo.scripts.neoadmin:main',
'neoctl=neo.scripts.neoctl:main', 'neoctl=neo.scripts.neoctl:main',
'neolog=neo.scripts.neolog:main',
'neomaster=neo.scripts.neomaster:main', 'neomaster=neo.scripts.neomaster:main',
'neomigrate=neo.scripts.neomigrate:main', 'neomigrate=neo.scripts.neomigrate:main',
'neostorage=neo.scripts.neostorage:main', 'neostorage=neo.scripts.neostorage:main',
......
...@@ -91,7 +91,6 @@ class MatrixImportBenchmark(BenchmarkRunner): ...@@ -91,7 +91,6 @@ class MatrixImportBenchmark(BenchmarkRunner):
master_count=masters, master_count=masters,
partitions=partitions, partitions=partitions,
replicas=replicas, replicas=replicas,
verbose=self._config.verbose,
) )
try: try:
neo.start() neo.start()
......
...@@ -45,7 +45,6 @@ class ImportBenchmark(BenchmarkRunner): ...@@ -45,7 +45,6 @@ class ImportBenchmark(BenchmarkRunner):
partitions=config.partitions, partitions=config.partitions,
replicas=config.replicas, replicas=config.replicas,
master_count=config.masters, master_count=config.masters,
verbose=False,
) )
# import datafs # import datafs
try: try:
......
...@@ -74,7 +74,6 @@ class ReplicationBenchmark(BenchmarkRunner): ...@@ -74,7 +74,6 @@ class ReplicationBenchmark(BenchmarkRunner):
partitions=config.partitions, partitions=config.partitions,
replicas=1, replicas=1,
master_count=1, master_count=1,
verbose=False,
) )
neo.start() neo.start()
p_time = r_time = None p_time = r_time = None
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment