June 2008 - rhmessaging-commits - Jboss List Archives

rhmessaging commits: r2132 - store/trunk/cpp/tests.

by rhmessaging-commits＠lists.jboss.org

Author: gordonsim Date: 2008-06-05 08:14:23 -0400 (Thu, 05 Jun 2008) New Revision: 2132 Modified: store/trunk/cpp/tests/run_python_tests store/trunk/cpp/tests/system_test.sh Log: Don't load from module-dir when running tests. Modified: store/trunk/cpp/tests/run_python_tests =================================================================== --- store/trunk/cpp/tests/run_python_tests 2008-06-04 23:54:07 UTC (rev 2131) +++ store/trunk/cpp/tests/run_python_tests 2008-06-05 12:14:23 UTC (rev 2132) @@ -23,7 +23,7 @@ QPID_PYTHON_DIR=$QPID_DIR/python export PYTHONPATH=${QPID_PYTHON_DIR}:${abs_srcdir} -BROKER_OPTS="--load-module=${LIBBDBSTORE} --data-dir=${TMPDIR} --auth=no" +BROKER_OPTS="--no-module-dir --load-module=${LIBBDBSTORE} --data-dir=${TMPDIR} --auth=no" PYTHON_TESTS=python_tests AMQP_SPEC=0-10-errata FAILING_PYTHON_TESTS=${abs_srcdir}/failing_python_tests.txt Modified: store/trunk/cpp/tests/system_test.sh =================================================================== --- store/trunk/cpp/tests/system_test.sh 2008-06-04 23:54:07 UTC (rev 2131) +++ store/trunk/cpp/tests/system_test.sh 2008-06-05 12:14:23 UTC (rev 2132) @@ -44,7 +44,7 @@ fail=0 # Run the tests with a given set of flags -BROKER_OPTS="--load-module=$LIBBDBSTORE --data-dir=$TMPDIR --auth=no --store-force=yes --wcache-page-size 16" +BROKER_OPTS="--no-module-dir --load-module=$LIBBDBSTORE --data-dir=$TMPDIR --auth=no --store-force=yes --wcache-page-size 16" run_tests() { for p in `seq 1 8`; do $abs_srcdir/start_broker "$@" ${BROKER_OPTS} || return 1

17 years, 11 months

1
0
0 / 0

rhmessaging commits: r2131 - in store/trunk/cpp: lib/jrnl and 2 other directories.

by rhmessaging-commits＠lists.jboss.org

Author: kpvdr Date: 2008-06-04 19:54:07 -0400 (Wed, 04 Jun 2008) New Revision: 2131 Added: store/trunk/cpp/tests/failing_python_tests.txt store/trunk/cpp/tests/python_tests/ store/trunk/cpp/tests/python_tests/__init__.py store/trunk/cpp/tests/python_tests/flow_to_disk.py store/trunk/cpp/tests/run_python_tests Modified: store/trunk/cpp/lib/JournalImpl.cpp store/trunk/cpp/lib/jrnl/jexception.hpp store/trunk/cpp/tests/Makefile.am store/trunk/cpp/tests/clean.sh store/trunk/cpp/tests/run_test store/trunk/cpp/tests/start_broker store/trunk/cpp/tests/stop_broker Log: Added python tests and scripts to the store Modified: store/trunk/cpp/lib/JournalImpl.cpp =================================================================== --- store/trunk/cpp/lib/JournalImpl.cpp 2008-06-04 23:18:47 UTC (rev 2130) +++ store/trunk/cpp/lib/JournalImpl.cpp 2008-06-04 23:54:07 UTC (rev 2131) @@ -370,7 +370,7 @@ void JournalImpl::txn_abort(data_tok* const dtokp, const std::string& xid) { - handleIoResult(jcntl::txn_abort(dtokp, xid)); + handleIoResult(jcntl::txn_abort(dtokp, xid)); } void Modified: store/trunk/cpp/lib/jrnl/jexception.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/jexception.hpp 2008-06-04 23:18:47 UTC (rev 2130) +++ store/trunk/cpp/lib/jrnl/jexception.hpp 2008-06-04 23:54:07 UTC (rev 2131) @@ -41,6 +41,7 @@ } } +#include <cstring> #include <exception> #include <string> #include <sys/types.h> Modified: store/trunk/cpp/tests/Makefile.am =================================================================== --- store/trunk/cpp/tests/Makefile.am 2008-06-04 23:18:47 UTC (rev 2130) +++ store/trunk/cpp/tests/Makefile.am 2008-06-04 23:54:07 UTC (rev 2131) @@ -14,6 +14,7 @@ OrderingTest \ TransactionalTest \ TwoPhaseCommitTest \ + run_python_tests \ system_test.sh \ clean.sh @@ -41,12 +42,15 @@ EXTRA_DIST = \ clean.sh \ + failing_python_tests.txt \ + persistence.py \ + python_tests \ + run_python_tests \ + run_test \ start_broker \ stop_broker \ system_test.sh \ - persistence.py \ MessageUtils.h \ - run_test \ vg_check \ .valgrindrc \ .valgrind.supp @@ -58,4 +62,3 @@ LIBBDBSTORE=$(abs_builddir)/../lib/.libs/libbdbstore.so \ TMPDIR=$(TMPDIR) \ $(srcdir)/run_test - Modified: store/trunk/cpp/tests/clean.sh =================================================================== --- store/trunk/cpp/tests/clean.sh 2008-06-04 23:18:47 UTC (rev 2130) +++ store/trunk/cpp/tests/clean.sh 2008-06-04 23:54:07 UTC (rev 2131) @@ -28,3 +28,4 @@ if [ -d ${TMPDIR} ]; then rm -rf ${TMPDIR} fi +rm -f ${abs_srcdir}/*.vglog* Added: store/trunk/cpp/tests/failing_python_tests.txt =================================================================== --- store/trunk/cpp/tests/failing_python_tests.txt (rev 0) +++ store/trunk/cpp/tests/failing_python_tests.txt 2008-06-04 23:54:07 UTC (rev 2131) @@ -0,0 +1,4 @@ +python_tests.flow_to_disk.AsyncFlowToDiskTests.test_simple_max_count_transient +python_tests.flow_to_disk.AsyncFlowToDiskTests.test_simple_max_count_persistent +python_tests.flow_to_disk.AsyncFlowToDiskTests.test_simple_max_size_transient +python_tests.flow_to_disk.AsyncFlowToDiskTests.test_simple_max_size_persistent Added: store/trunk/cpp/tests/python_tests/__init__.py =================================================================== --- store/trunk/cpp/tests/python_tests/__init__.py (rev 0) +++ store/trunk/cpp/tests/python_tests/__init__.py 2008-06-04 23:54:07 UTC (rev 2131) @@ -0,0 +1,22 @@ +# Do not delete - marks this directory as a python package. + +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +from flow_to_disk import * Added: store/trunk/cpp/tests/python_tests/flow_to_disk.py =================================================================== --- store/trunk/cpp/tests/python_tests/flow_to_disk.py (rev 0) +++ store/trunk/cpp/tests/python_tests/flow_to_disk.py 2008-06-04 23:54:07 UTC (rev 2131) @@ -0,0 +1,73 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +from qpid.client import Client, Closed +from qpid.queue import Empty +from qpid.testlib import TestBase010 +from qpid.datatypes import Message +from qpid.session import SessionException + +class AsyncFlowToDiskTests(TestBase010): + """Tests for async store flow-to-disk""" + + def test_simple_max_count_transient(self): + queue_args = {'qpid.max_count': 10} + self.simple_limit("test_simple_max_count_transient", queue_args, self.session.delivery_mode.non_persistent) + + def test_simple_max_count_persistent(self): + queue_args = {'qpid.max_count': 10} + self.simple_limit("test_simple_max_count_persistent", queue_args, self.session.delivery_mode.persistent) + + def test_simple_max_size_transient(self): + queue_args = {'qpid.max_size': 100} + self.simple_limit("test_simple_max_size_transient", queue_args, self.session.delivery_mode.non_persistent) + + def test_simple_max_size_persistent(self): + queue_args = {'qpid.max_size': 100} + self.simple_limit("test_simple_max_size_persistent", queue_args, self.session.delivery_mode.persistent) + + def simple_limit(self, queue_name, queue_args, delivery_mode): + """ + Test a simple case of max message count. + * queue_args sets a limit - either max_count 10 or max_size 100 + * 15 messages are added. The last five will flow to disk. + * Consume 15 messages. + """ + + session = self.session + session.queue_declare(queue=queue_name, durable=True, arguments=queue_args) + + # Add 15 messages + for msg_num in range(0, 15): + msg_str = "Message %02d" % msg_num + session.message_transfer(message=Message(session.delivery_properties(routing_key=queue_name, delivery_mode=delivery_mode), msg_str)) + + # Consume 15 messages + session.message_subscribe(queue=queue_name, destination="tag") + session.message_flow(destination="tag", unit=session.credit_unit.message, value=0xFFFFFFFF) + session.message_flow(destination="tag", unit=session.credit_unit.byte, value=0xFFFFFFFF) + queue = session.incoming("tag") + for msg_num in range(0, 15): + expected_str = "Message %02d" % msg_num + msg = queue.get(timeout=5) + self.assertEqual(expected_str, msg.body) + + # Check queue is empty + session.queue_declare(queue=queue_name) + reply = session.queue_query(queue=queue_name) + self.assertEqual(0, reply.message_count) Added: store/trunk/cpp/tests/run_python_tests =================================================================== --- store/trunk/cpp/tests/run_python_tests (rev 0) +++ store/trunk/cpp/tests/run_python_tests 2008-06-04 23:54:07 UTC (rev 2131) @@ -0,0 +1,80 @@ +#!/bin/bash +# +# Copyright (C) 2007 Red Hat Software +# +# This file is part of Red Hat Messaging. +# +# Red Hat Messaging is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This file 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 +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 +# USA +# +# The GNU Lesser General Public License is available in the file COPYING. + +QPID_PYTHON_DIR=$QPID_DIR/python +export PYTHONPATH=${QPID_PYTHON_DIR}:${abs_srcdir} +BROKER_OPTS="--load-module=${LIBBDBSTORE} --data-dir=${TMPDIR} --auth=no" +PYTHON_TESTS=python_tests +AMQP_SPEC=0-10-errata +FAILING_PYTHON_TESTS=${abs_srcdir}/failing_python_tests.txt + +# Make sure ${QPID_DIR} contains what we need. +if ! test -d "${QPID_DIR}" ; then + echo "WARNING: QPID_DIR is not set - skipping python tests." + exit +fi + +#Make sure temp dir exists if this is the first to use it +if ! test -d ${TMPDIR} ; then + mkdir -p ${TMPDIR} +fi + +#Split PYTHONPATH at ':' and check each path exists +old_ifs=${IFS} +IFS=':' +missing=0 +for path in ${PYTHONPATH} ; do + if ! test -d ${path} ; then + echo "WARNING: ${path} not found." + missing=1 + fi +done +IFS=${old_ifs} + +fail=0 +if test ${missing} != 0 ; then + echo "WARNING: Path(s) in ${PYTHONPATH} not found - skipping python tests." + exit 1 +else + # 1. Start broker + echo -n "Starting broker... " + ${abs_srcdir}/start_broker "$@" ${BROKER_OPTS} || { echo "FAIL broker start"; exit 1; } + if ! test -f qpidd.port; then + echo "FAIL no qpidd.port file found - broker may have failed to start" + exit 1 + fi + port=`cat qpidd.port` + echo "port=${port} ok" + + # 2. Run all python tests + pwdir=$(pwd) + cd ${QPID_PYTHON_DIR} + ./run-tests --skip-self-test -v -s ${AMQP_SPEC} -I ${FAILING_PYTHON_TESTS} -b localhost:${port} ${PYTHON_TESTS} || { echo "FAIL python tests for ${SPEC}"; fail=1; } + cd ${pwdir} + + #3. Stop broker + echo -n "Stopping broker on port ${port}... " + ${abs_srcdir}/stop_broker || { echo "FAIL broker stop"; fail=1; } + echo "ok" + exit ${fail} +fi Property changes on: store/trunk/cpp/tests/run_python_tests ___________________________________________________________________ Name: svn:executable + * Modified: store/trunk/cpp/tests/run_test =================================================================== --- store/trunk/cpp/tests/run_test 2008-06-04 23:18:47 UTC (rev 2130) +++ store/trunk/cpp/tests/run_test 2008-06-04 23:54:07 UTC (rev 2131) @@ -27,14 +27,14 @@ test -z "$LC_MESSAGES" && export LC_MESSAGES= VG_LOG="$1.vglog" -rm -f $VG_LOG +rm -f $VG_LOG* if grep -l "^# Generated by .*libtool" "$1" >/dev/null 2>&1; then # This is a libtool "executable". Valgrind it if VALGRIND specified. - test -n "$VALGRIND" && VALGRIND="$VALGRIND --log-file-exactly=$VG_LOG --" + test -n "$VALGRIND" && VALGRIND="$VALGRIND --log-file=$VG_LOG --" # Hide output unless there's an error. libtool --mode=execute $VALGRIND "$@" 2>&1 || ERROR=$? - test -n "$VALGRIND" && vg_check + test -n "$VALGRIND" && vg_check $VG_LOG* else # This is a non-libtool shell script, just execute it. export VALGRIND srcdir @@ -43,7 +43,7 @@ if test -z "$ERROR"; then # Clean up logs if there was no error. - rm -f $VG_LOG + rm -f $VG_LOG* exit 0 else exit $ERROR Modified: store/trunk/cpp/tests/start_broker =================================================================== --- store/trunk/cpp/tests/start_broker 2008-06-04 23:18:47 UTC (rev 2130) +++ store/trunk/cpp/tests/start_broker 2008-06-04 23:54:07 UTC (rev 2131) @@ -1,5 +1,5 @@ #!/bin/sh QPIDD=$QPID_DIR/cpp/src/qpidd -rm -f qpidd.vglog qpidd.log -test -n "$VALGRIND" && VALGRIND="$VALGRIND --log-file-exactly=qpidd.vglog --" +rm -f qpidd.vglog* qpidd.log +test -n "$VALGRIND" && VALGRIND="$VALGRIND --log-file=qpidd.vglog --" exec libtool --mode=execute $VALGRIND $QPIDD --daemon --port=0 --log-output qpidd.log "$@" > qpidd.port Modified: store/trunk/cpp/tests/stop_broker =================================================================== --- store/trunk/cpp/tests/stop_broker 2008-06-04 23:18:47 UTC (rev 2130) +++ store/trunk/cpp/tests/stop_broker 2008-06-04 23:54:07 UTC (rev 2131) @@ -1,21 +1,26 @@ #!/bin/sh # Stop the broker, check for errors. # -export QPID_PORT=`cat qpidd.port` -QPIDD=$QPID_DIR/cpp/src/qpidd -rm -f qpidd.port +if test -f qpidd.port; then + export QPID_PORT=`cat qpidd.port` + QPIDD=$QPID_DIR/cpp/src/qpidd + rm -f qpidd.port -$QPIDD --quit || ERROR=$? + $QPIDD --quit || ERROR=$? -# Check qpidd.log. -grep -a 'warning\|error\|critical' qpidd.log && { - echo "WARNING: Suspicious broker log entries in qpidd.log, above." -} + # Check qpidd.log. + grep -a 'warning\|error\|critical' qpidd.log && { + echo "WARNING: Suspicious broker log entries in qpidd.log, above." + } -# Check valgrind log. -if test -n "$VALGRIND"; then - source `dirname $0`/vg_check - vg_check qpidd.vglog + # Check valgrind log. + if test -n "$VALGRIND"; then + source `dirname $0`/vg_check $VG_LOG* + vg_check qpidd.vglog* + fi + + exit $ERROR +else + echo "No qpidd.port file found - cannot stop broker." + exit 1; fi - -exit $ERROR

17 years, 11 months

1
0
0 / 0

rhmessaging commits: r2130 - in store/trunk: cpp/lib/gen/qpid/management and 1 other directories.

by rhmessaging-commits＠lists.jboss.org

Author: tedross Date: 2008-06-04 19:18:47 -0400 (Wed, 04 Jun 2008) New Revision: 2130 Modified: store/trunk/cpp/lib/JournalImpl.cpp store/trunk/cpp/lib/JournalImpl.h store/trunk/cpp/lib/gen/qpid/management/Journal.cpp store/trunk/cpp/lib/gen/qpid/management/Journal.h store/trunk/cpp/lib/gen/qpid/management/Store.cpp store/trunk/cpp/lib/gen/qpid/management/Store.h store/trunk/specs/management-schema.xml Log: Cleaned up element names in journal management class Modified: store/trunk/cpp/lib/JournalImpl.cpp =================================================================== --- store/trunk/cpp/lib/JournalImpl.cpp 2008-06-04 21:20:00 UTC (rev 2129) +++ store/trunk/cpp/lib/JournalImpl.cpp 2008-06-04 23:18:47 UTC (rev 2130) @@ -79,10 +79,10 @@ (new qpid::management::Journal((qpid::management::Manageable*) this)); _mgmtObject->set_name(journalId); - _mgmtObject->set_journalDirectory(journalDirectory); - _mgmtObject->set_journalBaseFileName(journalBaseFilename); - _mgmtObject->set_journalReadPageSize(JRNL_RMGR_PAGE_SIZE * JRNL_SBLK_SIZE * JRNL_DBLK_SIZE); - _mgmtObject->set_journalReadPages(JRNL_RMGR_PAGES); + _mgmtObject->set_directory(journalDirectory); + _mgmtObject->set_baseFileName(journalBaseFilename); + _mgmtObject->set_readPageSize(JRNL_RMGR_PAGE_SIZE * JRNL_SBLK_SIZE * JRNL_DBLK_SIZE); + _mgmtObject->set_readPages(JRNL_RMGR_PAGES); agent->addObject(_mgmtObject); } @@ -145,9 +145,9 @@ { _mgmtObject->set_initialFileCount(_num_jfiles); _mgmtObject->set_dataFileSize(_jfsize_sblks * JRNL_SBLK_SIZE * JRNL_DBLK_SIZE); - _mgmtObject->set_journalCurrentFileCount(_num_jfiles); - _mgmtObject->set_journalWritePageSize(wcache_pgsize_sblks * JRNL_SBLK_SIZE * JRNL_DBLK_SIZE); - _mgmtObject->set_journalWritePages(wcache_num_pages); + _mgmtObject->set_currentFileCount(_num_jfiles); + _mgmtObject->set_writePageSize(wcache_pgsize_sblks * JRNL_SBLK_SIZE * JRNL_DBLK_SIZE); + _mgmtObject->set_writePages(wcache_num_pages); } } @@ -207,10 +207,10 @@ { _mgmtObject->set_initialFileCount(_num_jfiles); _mgmtObject->set_dataFileSize(_jfsize_sblks * JRNL_SBLK_SIZE * JRNL_DBLK_SIZE); - _mgmtObject->set_journalCurrentFileCount(_num_jfiles); - _mgmtObject->set_journalRecordDepth(_emap.size()); - _mgmtObject->set_journalWritePageSize(wcache_pgsize_sblks * JRNL_SBLK_SIZE * JRNL_DBLK_SIZE); - _mgmtObject->set_journalWritePages(wcache_num_pages); + _mgmtObject->set_currentFileCount(_num_jfiles); + _mgmtObject->set_recordDepth(_emap.size()); + _mgmtObject->set_writePageSize(wcache_pgsize_sblks * JRNL_SBLK_SIZE * JRNL_DBLK_SIZE); + _mgmtObject->set_writePages(wcache_num_pages); } } @@ -299,8 +299,8 @@ if (_mgmtObject.get() != 0) { - _mgmtObject->inc_journalRecordEnqueues(); - _mgmtObject->inc_journalRecordDepth(); + _mgmtObject->inc_recordEnqueues(); + _mgmtObject->inc_recordDepth(); } } @@ -312,8 +312,8 @@ if (_mgmtObject.get() != 0) { - _mgmtObject->inc_journalRecordEnqueues(); - _mgmtObject->inc_journalRecordDepth(); + _mgmtObject->inc_recordEnqueues(); + _mgmtObject->inc_recordDepth(); } } @@ -325,8 +325,8 @@ if (_mgmtObject.get() != 0) { - _mgmtObject->inc_journalRecordEnqueues(); - _mgmtObject->inc_journalRecordDepth(); + _mgmtObject->inc_recordEnqueues(); + _mgmtObject->inc_recordDepth(); } } @@ -338,8 +338,8 @@ if (_mgmtObject.get() != 0) { - _mgmtObject->inc_journalRecordEnqueues(); - _mgmtObject->inc_journalRecordDepth(); + _mgmtObject->inc_recordEnqueues(); + _mgmtObject->inc_recordDepth(); } } @@ -350,8 +350,8 @@ if (_mgmtObject.get() != 0) { - _mgmtObject->inc_journalRecordDequeues(); - _mgmtObject->dec_journalRecordDepth(); + _mgmtObject->inc_recordDequeues(); + _mgmtObject->dec_recordDepth(); } } @@ -362,8 +362,8 @@ if (_mgmtObject.get() != 0) { - _mgmtObject->inc_journalRecordDequeues(); - _mgmtObject->dec_journalRecordDepth(); + _mgmtObject->inc_recordDequeues(); + _mgmtObject->dec_recordDepth(); } } Modified: store/trunk/cpp/lib/JournalImpl.h =================================================================== --- store/trunk/cpp/lib/JournalImpl.h 2008-06-04 21:20:00 UTC (rev 2129) +++ store/trunk/cpp/lib/JournalImpl.h 2008-06-04 23:18:47 UTC (rev 2130) @@ -196,10 +196,10 @@ // Management instrumentation callbacks overridden from jcntl inline void instr_incr_outstanding_aio_cnt() { - if (_mgmtObject.get() != 0) _mgmtObject->inc_journalOutstandingAIOs(); + if (_mgmtObject.get() != 0) _mgmtObject->inc_outstandingAIOs(); } inline void instr_decr_outstanding_aio_cnt() { - if (_mgmtObject.get() != 0) _mgmtObject->dec_journalOutstandingAIOs(); + if (_mgmtObject.get() != 0) _mgmtObject->dec_outstandingAIOs(); } }; // class JournalImpl Modified: store/trunk/cpp/lib/gen/qpid/management/Journal.cpp =================================================================== --- store/trunk/cpp/lib/gen/qpid/management/Journal.cpp 2008-06-04 21:20:00 UTC (rev 2129) +++ store/trunk/cpp/lib/gen/qpid/management/Journal.cpp 2008-06-04 23:18:47 UTC (rev 2130) @@ -36,7 +36,7 @@ string Journal::packageName = string ("mrgstore"); string Journal::className = string ("journal"); uint8_t Journal::md5Sum[16] = - {0xcd,0x98,0xdb,0x90,0xd7,0x0,0xc5,0x9f,0x17,0x0,0x50,0x0,0xfc,0xc2,0x45,0x86}; + {0x0,0xdf,0x9a,0xf7,0x4,0x98,0x29,0x54,0xde,0x42,0xc5,0xf5,0xf5,0x13,0xab,0xa5}; Journal::Journal (Manageable* _core) : ManagementObject(_core) @@ -45,31 +45,31 @@ initialFileCount = 0; dataFileSize = 0; - journalCurrentFileCount = 0; - journalRecordDepth = 0; - journalRecordDepthHigh = 0; - journalRecordDepthLow = 0; - journalRecordEnqueues = 0; - journalRecordDequeues = 0; - journalOutstandingAIOs = 0; - journalOutstandingAIOsHigh = 0; - journalOutstandingAIOsLow = 0; - journalFreeFileCount = 0; - journalFreeFileCountHigh = 0; - journalFreeFileCountLow = 0; - journalAvailableFileCount = 0; - journalAvailableFileCountHigh = 0; - journalAvailableFileCountLow = 0; - journalWriteWaitFailures = 0; - journalWriteBusyFailures = 0; - journalReadRecordCount = 0; - journalReadBusyFailures = 0; - journalWritePageCacheDepth = 0; - journalWritePageCacheDepthHigh = 0; - journalWritePageCacheDepthLow = 0; - journalReadPageCacheDepth = 0; - journalReadPageCacheDepthHigh = 0; - journalReadPageCacheDepthLow = 0; + currentFileCount = 0; + recordDepth = 0; + recordDepthHigh = 0; + recordDepthLow = 0; + recordEnqueues = 0; + recordDequeues = 0; + outstandingAIOs = 0; + outstandingAIOsHigh = 0; + outstandingAIOsLow = 0; + freeFileCount = 0; + freeFileCountHigh = 0; + freeFileCountLow = 0; + availableFileCount = 0; + availableFileCountHigh = 0; + availableFileCountLow = 0; + writeWaitFailures = 0; + writeBusyFailures = 0; + readRecordCount = 0; + readBusyFailures = 0; + writePageCacheDepth = 0; + writePageCacheDepthHigh = 0; + writePageCacheDepthLow = 0; + readPageCacheDepth = 0; + readPageCacheDepthHigh = 0; + readPageCacheDepthLow = 0; } @@ -120,7 +120,7 @@ buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalDirectory"); + ft.setString (NAME, "directory"); ft.setInt (TYPE, TYPE_SSTR); ft.setInt (ACCESS, ACCESS_RO); ft.setInt (INDEX, 0); @@ -128,7 +128,7 @@ buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalBaseFileName"); + ft.setString (NAME, "baseFileName"); ft.setInt (TYPE, TYPE_SSTR); ft.setInt (ACCESS, ACCESS_RO); ft.setInt (INDEX, 0); @@ -136,7 +136,7 @@ buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalWritePageSize"); + ft.setString (NAME, "writePageSize"); ft.setInt (TYPE, TYPE_U32); ft.setInt (ACCESS, ACCESS_RO); ft.setInt (INDEX, 0); @@ -145,7 +145,7 @@ buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalWritePages"); + ft.setString (NAME, "writePages"); ft.setInt (TYPE, TYPE_U32); ft.setInt (ACCESS, ACCESS_RO); ft.setInt (INDEX, 0); @@ -154,7 +154,7 @@ buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalReadPageSize"); + ft.setString (NAME, "readPageSize"); ft.setInt (TYPE, TYPE_U32); ft.setInt (ACCESS, ACCESS_RO); ft.setInt (INDEX, 0); @@ -163,7 +163,7 @@ buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalReadPages"); + ft.setString (NAME, "readPages"); ft.setInt (TYPE, TYPE_U32); ft.setInt (ACCESS, ACCESS_RO); ft.setInt (INDEX, 0); @@ -188,175 +188,175 @@ buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalCurrentFileCount"); + ft.setString (NAME, "currentFileCount"); ft.setInt (TYPE, TYPE_U32); ft.setString (UNIT, "file"); ft.setString (DESC, "Number of files currently allocated to this journal"); buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalRecordDepth"); + ft.setString (NAME, "recordDepth"); ft.setInt (TYPE, TYPE_U32); ft.setString (UNIT, "record"); ft.setString (DESC, "Number of enqueued records (durable messages)"); buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalRecordDepthHigh"); + ft.setString (NAME, "recordDepthHigh"); ft.setInt (TYPE, TYPE_U32); ft.setString (UNIT, "record"); ft.setString (DESC, "Number of enqueued records (durable messages) (High)"); buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalRecordDepthLow"); + ft.setString (NAME, "recordDepthLow"); ft.setInt (TYPE, TYPE_U32); ft.setString (UNIT, "record"); ft.setString (DESC, "Number of enqueued records (durable messages) (Low)"); buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalRecordEnqueues"); + ft.setString (NAME, "recordEnqueues"); ft.setInt (TYPE, TYPE_U64); ft.setString (UNIT, "record"); ft.setString (DESC, "Total enqueued records on journal"); buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalRecordDequeues"); + ft.setString (NAME, "recordDequeues"); ft.setInt (TYPE, TYPE_U64); ft.setString (UNIT, "record"); ft.setString (DESC, "Total dequeued records on journal"); buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalOutstandingAIOs"); + ft.setString (NAME, "outstandingAIOs"); ft.setInt (TYPE, TYPE_U32); ft.setString (UNIT, "aio_op"); ft.setString (DESC, "Number of outstanding AIO requests in Async IO system"); buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalOutstandingAIOsHigh"); + ft.setString (NAME, "outstandingAIOsHigh"); ft.setInt (TYPE, TYPE_U32); ft.setString (UNIT, "aio_op"); ft.setString (DESC, "Number of outstanding AIO requests in Async IO system (High)"); buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalOutstandingAIOsLow"); + ft.setString (NAME, "outstandingAIOsLow"); ft.setInt (TYPE, TYPE_U32); ft.setString (UNIT, "aio_op"); ft.setString (DESC, "Number of outstanding AIO requests in Async IO system (Low)"); buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalFreeFileCount"); + ft.setString (NAME, "freeFileCount"); ft.setInt (TYPE, TYPE_U32); ft.setString (UNIT, "file"); ft.setString (DESC, "Number of files free on this journal. Includes free files trapped in holes."); buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalFreeFileCountHigh"); + ft.setString (NAME, "freeFileCountHigh"); ft.setInt (TYPE, TYPE_U32); ft.setString (UNIT, "file"); ft.setString (DESC, "Number of files free on this journal. Includes free files trapped in holes. (High)"); buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalFreeFileCountLow"); + ft.setString (NAME, "freeFileCountLow"); ft.setInt (TYPE, TYPE_U32); ft.setString (UNIT, "file"); ft.setString (DESC, "Number of files free on this journal. Includes free files trapped in holes. (Low)"); buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalAvailableFileCount"); + ft.setString (NAME, "availableFileCount"); ft.setInt (TYPE, TYPE_U32); ft.setString (UNIT, "file"); ft.setString (DESC, "Number of files available to be written. Excluding holes"); buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalAvailableFileCountHigh"); + ft.setString (NAME, "availableFileCountHigh"); ft.setInt (TYPE, TYPE_U32); ft.setString (UNIT, "file"); ft.setString (DESC, "Number of files available to be written. Excluding holes (High)"); buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalAvailableFileCountLow"); + ft.setString (NAME, "availableFileCountLow"); ft.setInt (TYPE, TYPE_U32); ft.setString (UNIT, "file"); ft.setString (DESC, "Number of files available to be written. Excluding holes (Low)"); buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalWriteWaitFailures"); + ft.setString (NAME, "writeWaitFailures"); ft.setInt (TYPE, TYPE_U64); ft.setString (UNIT, "record"); ft.setString (DESC, "AIO Wait failures on write"); buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalWriteBusyFailures"); + ft.setString (NAME, "writeBusyFailures"); ft.setInt (TYPE, TYPE_U64); ft.setString (UNIT, "record"); ft.setString (DESC, "AIO Busy failures on write"); buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalReadRecordCount"); + ft.setString (NAME, "readRecordCount"); ft.setInt (TYPE, TYPE_U64); ft.setString (UNIT, "record"); ft.setString (DESC, "Records read from the journal"); buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalReadBusyFailures"); + ft.setString (NAME, "readBusyFailures"); ft.setInt (TYPE, TYPE_U64); ft.setString (UNIT, "record"); ft.setString (DESC, "AIO Busy failures on read"); buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalWritePageCacheDepth"); + ft.setString (NAME, "writePageCacheDepth"); ft.setInt (TYPE, TYPE_U32); ft.setString (UNIT, "wpage"); ft.setString (DESC, "Current depth of write-page-cache"); buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalWritePageCacheDepthHigh"); + ft.setString (NAME, "writePageCacheDepthHigh"); ft.setInt (TYPE, TYPE_U32); ft.setString (UNIT, "wpage"); ft.setString (DESC, "Current depth of write-page-cache (High)"); buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalWritePageCacheDepthLow"); + ft.setString (NAME, "writePageCacheDepthLow"); ft.setInt (TYPE, TYPE_U32); ft.setString (UNIT, "wpage"); ft.setString (DESC, "Current depth of write-page-cache (Low)"); buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalReadPageCacheDepth"); + ft.setString (NAME, "readPageCacheDepth"); ft.setInt (TYPE, TYPE_U32); ft.setString (UNIT, "rpage"); ft.setString (DESC, "Current depth of read-page-cache"); buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalReadPageCacheDepthHigh"); + ft.setString (NAME, "readPageCacheDepthHigh"); ft.setInt (TYPE, TYPE_U32); ft.setString (UNIT, "rpage"); ft.setString (DESC, "Current depth of read-page-cache (High)"); buf.put (ft); ft = FieldTable (); - ft.setString (NAME, "journalReadPageCacheDepthLow"); + ft.setString (NAME, "readPageCacheDepthLow"); ft.setInt (TYPE, TYPE_U32); ft.setString (UNIT, "rpage"); ft.setString (DESC, "Current depth of read-page-cache (Low)"); @@ -382,7 +382,7 @@ } -void Journal::writeConfig (Buffer& buf) +void Journal::writeProperties (Buffer& buf) { sys::Mutex::ScopedLock mutex(accessLock); configChanged = false; @@ -390,64 +390,65 @@ writeTimestamps (buf); buf.putShortString (name); buf.putLongLong (queueRef); - buf.putShortString (journalDirectory); - buf.putShortString (journalBaseFileName); - buf.putLong (journalWritePageSize); - buf.putLong (journalWritePages); - buf.putLong (journalReadPageSize); - buf.putLong (journalReadPages); + buf.putShortString (directory); + buf.putShortString (baseFileName); + buf.putLong (writePageSize); + buf.putLong (writePages); + buf.putLong (readPageSize); + buf.putLong (readPages); } -void Journal::writeInstrumentation (Buffer& buf, bool skipHeaders) +void Journal::writeStatistics (Buffer& buf, bool skipHeaders) { sys::Mutex::ScopedLock mutex(accessLock); instChanged = false; + if (!skipHeaders) writeTimestamps (buf); buf.putShort (initialFileCount); buf.putLong (dataFileSize); - buf.putLong (journalCurrentFileCount); - buf.putLong (journalRecordDepth); - buf.putLong (journalRecordDepthHigh); - buf.putLong (journalRecordDepthLow); - buf.putLongLong (journalRecordEnqueues); - buf.putLongLong (journalRecordDequeues); - buf.putLong (journalOutstandingAIOs); - buf.putLong (journalOutstandingAIOsHigh); - buf.putLong (journalOutstandingAIOsLow); - buf.putLong (journalFreeFileCount); - buf.putLong (journalFreeFileCountHigh); - buf.putLong (journalFreeFileCountLow); - buf.putLong (journalAvailableFileCount); - buf.putLong (journalAvailableFileCountHigh); - buf.putLong (journalAvailableFileCountLow); - buf.putLongLong (journalWriteWaitFailures); - buf.putLongLong (journalWriteBusyFailures); - buf.putLongLong (journalReadRecordCount); - buf.putLongLong (journalReadBusyFailures); - buf.putLong (journalWritePageCacheDepth); - buf.putLong (journalWritePageCacheDepthHigh); - buf.putLong (journalWritePageCacheDepthLow); - buf.putLong (journalReadPageCacheDepth); - buf.putLong (journalReadPageCacheDepthHigh); - buf.putLong (journalReadPageCacheDepthLow); + buf.putLong (currentFileCount); + buf.putLong (recordDepth); + buf.putLong (recordDepthHigh); + buf.putLong (recordDepthLow); + buf.putLongLong (recordEnqueues); + buf.putLongLong (recordDequeues); + buf.putLong (outstandingAIOs); + buf.putLong (outstandingAIOsHigh); + buf.putLong (outstandingAIOsLow); + buf.putLong (freeFileCount); + buf.putLong (freeFileCountHigh); + buf.putLong (freeFileCountLow); + buf.putLong (availableFileCount); + buf.putLong (availableFileCountHigh); + buf.putLong (availableFileCountLow); + buf.putLongLong (writeWaitFailures); + buf.putLongLong (writeBusyFailures); + buf.putLongLong (readRecordCount); + buf.putLongLong (readBusyFailures); + buf.putLong (writePageCacheDepth); + buf.putLong (writePageCacheDepthHigh); + buf.putLong (writePageCacheDepthLow); + buf.putLong (readPageCacheDepth); + buf.putLong (readPageCacheDepthHigh); + buf.putLong (readPageCacheDepthLow); // Maintenance of hi-lo statistics - journalRecordDepthHigh = journalRecordDepth; - journalRecordDepthLow = journalRecordDepth; - journalOutstandingAIOsHigh = journalOutstandingAIOs; - journalOutstandingAIOsLow = journalOutstandingAIOs; - journalFreeFileCountHigh = journalFreeFileCount; - journalFreeFileCountLow = journalFreeFileCount; - journalAvailableFileCountHigh = journalAvailableFileCount; - journalAvailableFileCountLow = journalAvailableFileCount; - journalWritePageCacheDepthHigh = journalWritePageCacheDepth; - journalWritePageCacheDepthLow = journalWritePageCacheDepth; - journalReadPageCacheDepthHigh = journalReadPageCacheDepth; - journalReadPageCacheDepthLow = journalReadPageCacheDepth; + recordDepthHigh = recordDepth; + recordDepthLow = recordDepth; + outstandingAIOsHigh = outstandingAIOs; + outstandingAIOsLow = outstandingAIOs; + freeFileCountHigh = freeFileCount; + freeFileCountLow = freeFileCount; + availableFileCountHigh = availableFileCount; + availableFileCountLow = availableFileCount; + writePageCacheDepthHigh = writePageCacheDepth; + writePageCacheDepthLow = writePageCacheDepth; + readPageCacheDepthHigh = readPageCacheDepth; + readPageCacheDepthLow = readPageCacheDepth; } Modified: store/trunk/cpp/lib/gen/qpid/management/Journal.h =================================================================== --- store/trunk/cpp/lib/gen/qpid/management/Journal.h 2008-06-04 21:20:00 UTC (rev 2129) +++ store/trunk/cpp/lib/gen/qpid/management/Journal.h 2008-06-04 23:18:47 UTC (rev 2130) @@ -43,50 +43,50 @@ // Properties std::string name; uint64_t queueRef; - std::string journalDirectory; - std::string journalBaseFileName; - uint32_t journalWritePageSize; - uint32_t journalWritePages; - uint32_t journalReadPageSize; - uint32_t journalReadPages; + std::string directory; + std::string baseFileName; + uint32_t writePageSize; + uint32_t writePages; + uint32_t readPageSize; + uint32_t readPages; // Statistics uint16_t initialFileCount; uint32_t dataFileSize; - uint32_t journalCurrentFileCount; - uint32_t journalRecordDepth; - uint32_t journalRecordDepthHigh; - uint32_t journalRecordDepthLow; - uint64_t journalRecordEnqueues; - uint64_t journalRecordDequeues; - uint32_t journalOutstandingAIOs; - uint32_t journalOutstandingAIOsHigh; - uint32_t journalOutstandingAIOsLow; - uint32_t journalFreeFileCount; - uint32_t journalFreeFileCountHigh; - uint32_t journalFreeFileCountLow; - uint32_t journalAvailableFileCount; - uint32_t journalAvailableFileCountHigh; - uint32_t journalAvailableFileCountLow; - uint64_t journalWriteWaitFailures; - uint64_t journalWriteBusyFailures; - uint64_t journalReadRecordCount; - uint64_t journalReadBusyFailures; - uint32_t journalWritePageCacheDepth; - uint32_t journalWritePageCacheDepthHigh; - uint32_t journalWritePageCacheDepthLow; - uint32_t journalReadPageCacheDepth; - uint32_t journalReadPageCacheDepthHigh; - uint32_t journalReadPageCacheDepthLow; + uint32_t currentFileCount; + uint32_t recordDepth; + uint32_t recordDepthHigh; + uint32_t recordDepthLow; + uint64_t recordEnqueues; + uint64_t recordDequeues; + uint32_t outstandingAIOs; + uint32_t outstandingAIOsHigh; + uint32_t outstandingAIOsLow; + uint32_t freeFileCount; + uint32_t freeFileCountHigh; + uint32_t freeFileCountLow; + uint32_t availableFileCount; + uint32_t availableFileCountHigh; + uint32_t availableFileCountLow; + uint64_t writeWaitFailures; + uint64_t writeBusyFailures; + uint64_t readRecordCount; + uint64_t readBusyFailures; + uint32_t writePageCacheDepth; + uint32_t writePageCacheDepthHigh; + uint32_t writePageCacheDepthLow; + uint32_t readPageCacheDepth; + uint32_t readPageCacheDepthHigh; + uint32_t readPageCacheDepthLow; // Private Methods - static void writeSchema (qpid::framing::Buffer& buf); - void writeConfig (qpid::framing::Buffer& buf); - void writeInstrumentation (qpid::framing::Buffer& buf, - bool skipHeaders = false); - void doMethod (std::string methodName, - qpid::framing::Buffer& inBuf, - qpid::framing::Buffer& outBuf); + static void writeSchema (qpid::framing::Buffer& buf); + void writeProperties (qpid::framing::Buffer& buf); + void writeStatistics (qpid::framing::Buffer& buf, + bool skipHeaders = false); + void doMethod (std::string methodName, + qpid::framing::Buffer& inBuf, + qpid::framing::Buffer& outBuf); writeSchemaCall_t getWriteSchemaCall (void) { return writeSchema; } @@ -119,34 +119,34 @@ queueRef = val; configChanged = true; } - inline void set_journalDirectory (std::string val){ + inline void set_directory (std::string val){ sys::Mutex::ScopedLock mutex(accessLock); - journalDirectory = val; + directory = val; configChanged = true; } - inline void set_journalBaseFileName (std::string val){ + inline void set_baseFileName (std::string val){ sys::Mutex::ScopedLock mutex(accessLock); - journalBaseFileName = val; + baseFileName = val; configChanged = true; } - inline void set_journalWritePageSize (uint32_t val){ + inline void set_writePageSize (uint32_t val){ sys::Mutex::ScopedLock mutex(accessLock); - journalWritePageSize = val; + writePageSize = val; configChanged = true; } - inline void set_journalWritePages (uint32_t val){ + inline void set_writePages (uint32_t val){ sys::Mutex::ScopedLock mutex(accessLock); - journalWritePages = val; + writePages = val; configChanged = true; } - inline void set_journalReadPageSize (uint32_t val){ + inline void set_readPageSize (uint32_t val){ sys::Mutex::ScopedLock mutex(accessLock); - journalReadPageSize = val; + readPageSize = val; configChanged = true; } - inline void set_journalReadPages (uint32_t val){ + inline void set_readPages (uint32_t val){ sys::Mutex::ScopedLock mutex(accessLock); - journalReadPages = val; + readPages = val; configChanged = true; } inline void set_initialFileCount (uint16_t val){ @@ -159,291 +159,290 @@ dataFileSize = val; instChanged = true; } - inline void set_journalCurrentFileCount (uint32_t val){ + inline void set_currentFileCount (uint32_t val){ sys::Mutex::ScopedLock mutex(accessLock); - journalCurrentFileCount = val; + currentFileCount = val; instChanged = true; } - inline void inc_journalRecordDepth (uint32_t by = 1){ + inline void inc_recordDepth (uint32_t by = 1){ if (by == 1) - ++journalRecordDepth; + ++recordDepth; else - journalRecordDepth += by; - if (journalRecordDepthHigh < journalRecordDepth) - journalRecordDepthHigh = journalRecordDepth; + recordDepth += by; + if (recordDepthHigh < recordDepth) + recordDepthHigh = recordDepth; instChanged = true; } - inline void dec_journalRecordDepth (uint32_t by = 1){ + inline void dec_recordDepth (uint32_t by = 1){ if (by == 1) - journalRecordDepth--; + recordDepth--; else - journalRecordDepth -= by; - if (journalRecordDepthLow > journalRecordDepth) - journalRecordDepthLow = journalRecordDepth; + recordDepth -= by; + if (recordDepthLow > recordDepth) + recordDepthLow = recordDepth; instChanged = true; } - inline void set_journalRecordDepth (uint32_t val){ + inline void set_recordDepth (uint32_t val){ sys::Mutex::ScopedLock mutex(accessLock); - journalRecordDepth = val; - if (journalRecordDepthLow > val) - journalRecordDepthLow = val; - if (journalRecordDepthHigh < val) - journalRecordDepthHigh = val; + recordDepth = val; + if (recordDepthLow > val) + recordDepthLow = val; + if (recordDepthHigh < val) + recordDepthHigh = val; instChanged = true; } - inline void inc_journalRecordEnqueues (uint64_t by = 1){ + inline void inc_recordEnqueues (uint64_t by = 1){ if (by == 1) - ++journalRecordEnqueues; + ++recordEnqueues; else - journalRecordEnqueues += by; + recordEnqueues += by; instChanged = true; } - inline void dec_journalRecordEnqueues (uint64_t by = 1){ + inline void dec_recordEnqueues (uint64_t by = 1){ if (by == 1) - journalRecordEnqueues--; + recordEnqueues--; else - journalRecordEnqueues -= by; + recordEnqueues -= by; instChanged = true; } - inline void set_journalRecordEnqueues (uint64_t val){ + inline void set_recordEnqueues (uint64_t val){ sys::Mutex::ScopedLock mutex(accessLock); - journalRecordEnqueues = val; + recordEnqueues = val; instChanged = true; } - inline void inc_journalRecordDequeues (uint64_t by = 1){ + inline void inc_recordDequeues (uint64_t by = 1){ if (by == 1) - ++journalRecordDequeues; + ++recordDequeues; else - journalRecordDequeues += by; + recordDequeues += by; instChanged = true; } - inline void dec_journalRecordDequeues (uint64_t by = 1){ + inline void dec_recordDequeues (uint64_t by = 1){ if (by == 1) - journalRecordDequeues--; + recordDequeues--; else - journalRecordDequeues -= by; + recordDequeues -= by; instChanged = true; } - inline void set_journalRecordDequeues (uint64_t val){ + inline void set_recordDequeues (uint64_t val){ sys::Mutex::ScopedLock mutex(accessLock); - journalRecordDequeues = val; + recordDequeues = val; instChanged = true; } - inline void inc_journalOutstandingAIOs (uint32_t by = 1){ + inline void inc_outstandingAIOs (uint32_t by = 1){ if (by == 1) - ++journalOutstandingAIOs; + ++outstandingAIOs; else - journalOutstandingAIOs += by; - if (journalOutstandingAIOsHigh < journalOutstandingAIOs) - journalOutstandingAIOsHigh = journalOutstandingAIOs; + outstandingAIOs += by; + if (outstandingAIOsHigh < outstandingAIOs) + outstandingAIOsHigh = outstandingAIOs; instChanged = true; } - inline void dec_journalOutstandingAIOs (uint32_t by = 1){ + inline void dec_outstandingAIOs (uint32_t by = 1){ if (by == 1) - journalOutstandingAIOs--; + outstandingAIOs--; else - journalOutstandingAIOs -= by; - if (journalOutstandingAIOsLow > journalOutstandingAIOs) - journalOutstandingAIOsLow = journalOutstandingAIOs; + outstandingAIOs -= by; + if (outstandingAIOsLow > outstandingAIOs) + outstandingAIOsLow = outstandingAIOs; instChanged = true; } - inline void set_journalOutstandingAIOs (uint32_t val){ + inline void set_outstandingAIOs (uint32_t val){ sys::Mutex::ScopedLock mutex(accessLock); - journalOutstandingAIOs = val; - if (journalOutstandingAIOsLow > val) - journalOutstandingAIOsLow = val; - if (journalOutstandingAIOsHigh < val) - journalOutstandingAIOsHigh = val; + outstandingAIOs = val; + if (outstandingAIOsLow > val) + outstandingAIOsLow = val; + if (outstandingAIOsHigh < val) + outstandingAIOsHigh = val; instChanged = true; } - inline void inc_journalFreeFileCount (uint32_t by = 1){ + inline void inc_freeFileCount (uint32_t by = 1){ if (by == 1) - ++journalFreeFileCount; + ++freeFileCount; else - journalFreeFileCount += by; - if (journalFreeFileCountHigh < journalFreeFileCount) - journalFreeFileCountHigh = journalFreeFileCount; + freeFileCount += by; + if (freeFileCountHigh < freeFileCount) + freeFileCountHigh = freeFileCount; instChanged = true; } - inline void dec_journalFreeFileCount (uint32_t by = 1){ + inline void dec_freeFileCount (uint32_t by = 1){ if (by == 1) - journalFreeFileCount--; + freeFileCount--; else - journalFreeFileCount -= by; - if (journalFreeFileCountLow > journalFreeFileCount) - journalFreeFileCountLow = journalFreeFileCount; + freeFileCount -= by; + if (freeFileCountLow > freeFileCount) + freeFileCountLow = freeFileCount; instChanged = true; } - inline void set_journalFreeFileCount (uint32_t val){ + inline void set_freeFileCount (uint32_t val){ sys::Mutex::ScopedLock mutex(accessLock); - journalFreeFileCount = val; - if (journalFreeFileCountLow > val) - journalFreeFileCountLow = val; - if (journalFreeFileCountHigh < val) - journalFreeFileCountHigh = val; + freeFileCount = val; + if (freeFileCountLow > val) + freeFileCountLow = val; + if (freeFileCountHigh < val) + freeFileCountHigh = val; instChanged = true; } - inline void inc_journalAvailableFileCount (uint32_t by = 1){ + inline void inc_availableFileCount (uint32_t by = 1){ if (by == 1) - ++journalAvailableFileCount; + ++availableFileCount; else - journalAvailableFileCount += by; - if (journalAvailableFileCountHigh < journalAvailableFileCount) - journalAvailableFileCountHigh = journalAvailableFileCount; + availableFileCount += by; + if (availableFileCountHigh < availableFileCount) + availableFileCountHigh = availableFileCount; instChanged = true; } - inline void dec_journalAvailableFileCount (uint32_t by = 1){ + inline void dec_availableFileCount (uint32_t by = 1){ if (by == 1) - journalAvailableFileCount--; + availableFileCount--; else - journalAvailableFileCount -= by; - if (journalAvailableFileCountLow > journalAvailableFileCount) - journalAvailableFileCountLow = journalAvailableFileCount; + availableFileCount -= by; + if (availableFileCountLow > availableFileCount) + availableFileCountLow = availableFileCount; instChanged = true; } - inline void set_journalAvailableFileCount (uint32_t val){ + inline void set_availableFileCount (uint32_t val){ sys::Mutex::ScopedLock mutex(accessLock); - journalAvailableFileCount = val; - if (journalAvailableFileCountLow > val) - journalAvailableFileCountLow = val; - if (journalAvailableFileCountHigh < val) - journalAvailableFileCountHigh = val; + availableFileCount = val; + if (availableFileCountLow > val) + availableFileCountLow = val; + if (availableFileCountHigh < val) + availableFileCountHigh = val; instChanged = true; } - inline void inc_journalWriteWaitFailures (uint64_t by = 1){ + inline void inc_writeWaitFailures (uint64_t by = 1){ if (by == 1) - ++journalWriteWaitFailures; + ++writeWaitFailures; else - journalWriteWaitFailures += by; + writeWaitFailures += by; instChanged = true; } - inline void dec_journalWriteWaitFailures (uint64_t by = 1){ + inline void dec_writeWaitFailures (uint64_t by = 1){ if (by == 1) - journalWriteWaitFailures--; + writeWaitFailures--; else - journalWriteWaitFailures -= by; + writeWaitFailures -= by; instChanged = true; } - inline void set_journalWriteWaitFailures (uint64_t val){ + inline void set_writeWaitFailures (uint64_t val){ sys::Mutex::ScopedLock mutex(accessLock); - journalWriteWaitFailures = val; + writeWaitFailures = val; instChanged = true; } - inline void inc_journalWriteBusyFailures (uint64_t by = 1){ + inline void inc_writeBusyFailures (uint64_t by = 1){ if (by == 1) - ++journalWriteBusyFailures; + ++writeBusyFailures; else - journalWriteBusyFailures += by; + writeBusyFailures += by; instChanged = true; } - inline void dec_journalWriteBusyFailures (uint64_t by = 1){ + inline void dec_writeBusyFailures (uint64_t by = 1){ if (by == 1) - journalWriteBusyFailures--; + writeBusyFailures--; else - journalWriteBusyFailures -= by; + writeBusyFailures -= by; instChanged = true; } - inline void set_journalWriteBusyFailures (uint64_t val){ + inline void set_writeBusyFailures (uint64_t val){ sys::Mutex::ScopedLock mutex(accessLock); - journalWriteBusyFailures = val; + writeBusyFailures = val; instChanged = true; } - inline void inc_journalReadRecordCount (uint64_t by = 1){ + inline void inc_readRecordCount (uint64_t by = 1){ if (by == 1) - ++journalReadRecordCount; + ++readRecordCount; else - journalReadRecordCount += by; + readRecordCount += by; instChanged = true; } - inline void dec_journalReadRecordCount (uint64_t by = 1){ + inline void dec_readRecordCount (uint64_t by = 1){ if (by == 1) - journalReadRecordCount--; + readRecordCount--; else - journalReadRecordCount -= by; + readRecordCount -= by; instChanged = true; } - inline void set_journalReadRecordCount (uint64_t val){ + inline void set_readRecordCount (uint64_t val){ sys::Mutex::ScopedLock mutex(accessLock); - journalReadRecordCount = val; + readRecordCount = val; instChanged = true; } - inline void inc_journalReadBusyFailures (uint64_t by = 1){ + inline void inc_readBusyFailures (uint64_t by = 1){ if (by == 1) - ++journalReadBusyFailures; + ++readBusyFailures; else - journalReadBusyFailures += by; + readBusyFailures += by; instChanged = true; } - inline void dec_journalReadBusyFailures (uint64_t by = 1){ + inline void dec_readBusyFailures (uint64_t by = 1){ if (by == 1) - journalReadBusyFailures--; + readBusyFailures--; else - journalReadBusyFailures -= by; + readBusyFailures -= by; instChanged = true; } - inline void set_journalReadBusyFailures (uint64_t val){ + inline void set_readBusyFailures (uint64_t val){ sys::Mutex::ScopedLock mutex(accessLock); - journalReadBusyFailures = val; + readBusyFailures = val; instChanged = true; } - inline void inc_journalWritePageCacheDepth (uint32_t by = 1){ + inline void inc_writePageCacheDepth (uint32_t by = 1){ if (by == 1) - ++journalWritePageCacheDepth; + ++writePageCacheDepth; else - journalWritePageCacheDepth += by; - if (journalWritePageCacheDepthHigh < journalWritePageCacheDepth) - journalWritePageCacheDepthHigh = journalWritePageCacheDepth; + writePageCacheDepth += by; + if (writePageCacheDepthHigh < writePageCacheDepth) + writePageCacheDepthHigh = writePageCacheDepth; instChanged = true; } - inline void dec_journalWritePageCacheDepth (uint32_t by = 1){ + inline void dec_writePageCacheDepth (uint32_t by = 1){ if (by == 1) - journalWritePageCacheDepth--; + writePageCacheDepth--; else - journalWritePageCacheDepth -= by; - if (journalWritePageCacheDepthLow > journalWritePageCacheDepth) - journalWritePageCacheDepthLow = journalWritePageCacheDepth; + writePageCacheDepth -= by; + if (writePageCacheDepthLow > writePageCacheDepth) + writePageCacheDepthLow = writePageCacheDepth; instChanged = true; } - inline void set_journalWritePageCacheDepth (uint32_t val){ + inline void set_writePageCacheDepth (uint32_t val){ sys::Mutex::ScopedLock mutex(accessLock); - journalWritePageCacheDepth = val; - if (journalWritePageCacheDepthLow > val) - journalWritePageCacheDepthLow = val; - if (journalWritePageCacheDepthHigh < val) - journalWritePageCacheDepthHigh = val; + writePageCacheDepth = val; + if (writePageCacheDepthLow > val) + writePageCacheDepthLow = val; + if (writePageCacheDepthHigh < val) + writePageCacheDepthHigh = val; instChanged = true; } - inline void inc_journalReadPageCacheDepth (uint32_t by = 1){ + inline void inc_readPageCacheDepth (uint32_t by = 1){ if (by == 1) - ++journalReadPageCacheDepth; + ++readPageCacheDepth; else - journalReadPageCacheDepth += by; - if (journalReadPageCacheDepthHigh < journalReadPageCacheDepth) - journalReadPageCacheDepthHigh = journalReadPageCacheDepth; + readPageCacheDepth += by; + if (readPageCacheDepthHigh < readPageCacheDepth) + readPageCacheDepthHigh = readPageCacheDepth; instChanged = true; } - inline void dec_journalReadPageCacheDepth (uint32_t by = 1){ + inline void dec_readPageCacheDepth (uint32_t by = 1){ if (by == 1) - journalReadPageCacheDepth--; + readPageCacheDepth--; else - journalReadPageCacheDepth -= by; - if (journalReadPageCacheDepthLow > journalReadPageCacheDepth) - journalReadPageCacheDepthLow = journalReadPageCacheDepth; + readPageCacheDepth -= by; + if (readPageCacheDepthLow > readPageCacheDepth) + readPageCacheDepthLow = readPageCacheDepth; instChanged = true; } - inline void set_journalReadPageCacheDepth (uint32_t val){ + inline void set_readPageCacheDepth (uint32_t val){ sys::Mutex::ScopedLock mutex(accessLock); - journalReadPageCacheDepth = val; - if (journalReadPageCacheDepthLow > val) - journalReadPageCacheDepthLow = val; - if (journalReadPageCacheDepthHigh < val) - journalReadPageCacheDepthHigh = val; + readPageCacheDepth = val; + if (readPageCacheDepthLow > val) + readPageCacheDepthLow = val; + if (readPageCacheDepthHigh < val) + readPageCacheDepthHigh = val; instChanged = true; } }; }} - #endif /*!_MANAGEMENT_JOURNAL_*/ Modified: store/trunk/cpp/lib/gen/qpid/management/Store.cpp =================================================================== --- store/trunk/cpp/lib/gen/qpid/management/Store.cpp 2008-06-04 21:20:00 UTC (rev 2129) +++ store/trunk/cpp/lib/gen/qpid/management/Store.cpp 2008-06-04 23:18:47 UTC (rev 2130) @@ -127,7 +127,7 @@ } -void Store::writeConfig (Buffer& buf) +void Store::writeProperties (Buffer& buf) { sys::Mutex::ScopedLock mutex(accessLock); configChanged = false; @@ -141,11 +141,12 @@ } -void Store::writeInstrumentation (Buffer& buf, bool skipHeaders) +void Store::writeStatistics (Buffer& buf, bool skipHeaders) { sys::Mutex::ScopedLock mutex(accessLock); instChanged = false; + if (!skipHeaders) writeTimestamps (buf); Modified: store/trunk/cpp/lib/gen/qpid/management/Store.h =================================================================== --- store/trunk/cpp/lib/gen/qpid/management/Store.h 2008-06-04 21:20:00 UTC (rev 2129) +++ store/trunk/cpp/lib/gen/qpid/management/Store.h 2008-06-04 23:18:47 UTC (rev 2130) @@ -50,13 +50,13 @@ // Statistics // Private Methods - static void writeSchema (qpid::framing::Buffer& buf); - void writeConfig (qpid::framing::Buffer& buf); - void writeInstrumentation (qpid::framing::Buffer& buf, - bool skipHeaders = false); - void doMethod (std::string methodName, - qpid::framing::Buffer& inBuf, - qpid::framing::Buffer& outBuf); + static void writeSchema (qpid::framing::Buffer& buf); + void writeProperties (qpid::framing::Buffer& buf); + void writeStatistics (qpid::framing::Buffer& buf, + bool skipHeaders = false); + void doMethod (std::string methodName, + qpid::framing::Buffer& inBuf, + qpid::framing::Buffer& outBuf); writeSchemaCall_t getWriteSchemaCall (void) { return writeSchema; } // Stub for getInstChanged. There are no inst elements @@ -108,6 +108,5 @@ }; }} - #endif /*!_MANAGEMENT_STORE_*/ Modified: store/trunk/specs/management-schema.xml =================================================================== --- store/trunk/specs/management-schema.xml 2008-06-04 21:20:00 UTC (rev 2129) +++ store/trunk/specs/management-schema.xml 2008-06-04 23:18:47 UTC (rev 2130) @@ -12,34 +12,34 @@ </class> <class name="Journal"> - <property name="name" type="sstr" access="RO" index="y"/> - <property name="queueRef" type="objId" access="RO" references="qpid.Queue" isGeneralReference="y"/> - <property name="journalDirectory" type="sstr" access="RO" desc="Directory containing journal files"/> - <property name="journalBaseFileName" type="sstr" access="RO" desc="Base filename prefix for journal"/> - <property name="journalWritePageSize" type="uint32" access="RO" unit="byte" desc="Page size in write-page-cache"/> - <property name="journalWritePages" type="uint32" access="RO" unit="wpage" desc="Number of pages in write-page-cache"/> - <property name="journalReadPageSize" type="uint32" access="RO" unit="byte" desc="Page size in read-page-cache"/> - <property name="journalReadPages" type="uint32" access="RO" unit="rpage" desc="Number of pages in read-page-cache"/> + <property name="name" type="sstr" access="RO" index="y"/> + <property name="queueRef" type="objId" access="RO" references="qpid.Queue" isGeneralReference="y"/> + <property name="directory" type="sstr" access="RO" desc="Directory containing journal files"/> + <property name="baseFileName" type="sstr" access="RO" desc="Base filename prefix for journal"/> + <property name="writePageSize" type="uint32" access="RO" unit="byte" desc="Page size in write-page-cache"/> + <property name="writePages" type="uint32" access="RO" unit="wpage" desc="Number of pages in write-page-cache"/> + <property name="readPageSize" type="uint32" access="RO" unit="byte" desc="Page size in read-page-cache"/> + <property name="readPages" type="uint32" access="RO" unit="rpage" desc="Number of pages in read-page-cache"/> - <statistic name="initialFileCount" type="uint16" unit="file" desc="Number of files initially allocated to this journal"/> - <statistic name="dataFileSize" type="uint32" unit="byte" desc="Size of each journal data file"/> - <statistic name="journalCurrentFileCount" type="uint32" unit="file" desc="Number of files currently allocated to this journal"/> - <statistic name="journalRecordDepth" type="hilo32" unit="record" desc="Number of enqueued records (durable messages)"/> - <statistic name="journalRecordEnqueues" type="count64" unit="record" desc="Total enqueued records on journal"/> - <statistic name="journalRecordDequeues" type="count64" unit="record" desc="Total dequeued records on journal"/> - <statistic name="journalOutstandingAIOs" type="hilo32" unit="aio_op" desc="Number of outstanding AIO requests in Async IO system"/> + <statistic name="initialFileCount" type="uint16" unit="file" desc="Number of files initially allocated to this journal"/> + <statistic name="dataFileSize" type="uint32" unit="byte" desc="Size of each journal data file"/> + <statistic name="currentFileCount" type="uint32" unit="file" desc="Number of files currently allocated to this journal"/> + <statistic name="recordDepth" type="hilo32" unit="record" desc="Number of enqueued records (durable messages)"/> + <statistic name="recordEnqueues" type="count64" unit="record" desc="Total enqueued records on journal"/> + <statistic name="recordDequeues" type="count64" unit="record" desc="Total dequeued records on journal"/> + <statistic name="outstandingAIOs" type="hilo32" unit="aio_op" desc="Number of outstanding AIO requests in Async IO system"/>  - <statistic name="journalFreeFileCount" type="hilo32" unit="file" desc="Number of files free on this journal. Includes free files trapped in holes."/> - <statistic name="journalAvailableFileCount" type="hilo32" unit="file" desc="Number of files available to be written. Excluding holes"/> - <statistic name="journalWriteWaitFailures" type="count64" unit="record" desc="AIO Wait failures on write"/> - <statistic name="journalWriteBusyFailures" type="count64" unit="record" desc="AIO Busy failures on write"/> - <statistic name="journalReadRecordCount" type="count64" unit="record" desc="Records read from the journal"/> - <statistic name="journalReadBusyFailures" type="count64" unit="record" desc="AIO Busy failures on read"/> - <statistic name="journalWritePageCacheDepth" type="hilo32" unit="wpage" desc="Current depth of write-page-cache"/> - <statistic name="journalReadPageCacheDepth" type="hilo32" unit="rpage" desc="Current depth of read-page-cache"/> + <statistic name="freeFileCount" type="hilo32" unit="file" desc="Number of files free on this journal. Includes free files trapped in holes."/> + <statistic name="availableFileCount" type="hilo32" unit="file" desc="Number of files available to be written. Excluding holes"/> + <statistic name="writeWaitFailures" type="count64" unit="record" desc="AIO Wait failures on write"/> + <statistic name="writeBusyFailures" type="count64" unit="record" desc="AIO Busy failures on write"/> + <statistic name="readRecordCount" type="count64" unit="record" desc="Records read from the journal"/> + <statistic name="readBusyFailures" type="count64" unit="record" desc="AIO Busy failures on read"/> + <statistic name="writePageCacheDepth" type="hilo32" unit="wpage" desc="Current depth of write-page-cache"/> + <statistic name="readPageCacheDepth" type="hilo32" unit="rpage" desc="Current depth of read-page-cache"/> <method name="expand" desc="Increase number of files allocated for this journal"> <arg name="by" type="uint32" dir="I" desc="Number of files to increase journal size by"/>

17 years, 11 months

1
0
0 / 0

rhmessaging commits: r2129 - in mgmt/mint: sql and 1 other directory.

by rhmessaging-commits＠lists.jboss.org

Author: nunofsantos Date: 2008-06-04 17:20:00 -0400 (Wed, 04 Jun 2008) New Revision: 2129 Modified: mgmt/mint/python/mint/schema.py mgmt/mint/python/mint/schemaparser.py mgmt/mint/sql/schema.sql Log: parser now handles references to a class in a different namespace Modified: mgmt/mint/python/mint/schema.py =================================================================== --- mgmt/mint/python/mint/schema.py 2008-06-04 18:18:39 UTC (rev 2128) +++ mgmt/mint/python/mint/schema.py 2008-06-04 21:20:00 UTC (rev 2129) @@ -604,9 +604,17 @@ managedBroker = StringCol(length=1000, default=None) statsCurr = ForeignKey('StoreStats', cascade='null', default=None) statsPrev = ForeignKey('StoreStats', cascade='null', default=None) + broker = ForeignKey('Broker', cascade='null', default=None) + location = StringCol(length=1000, default=None) + async = BoolCol(default=None) + defaultInitialFileCount = SmallIntCol(default=None) + defaultDataFileSize = IntCol(default=None) classInfos = dict() # brokerId => classInfo +Broker.sqlmeta.addJoin(SQLMultipleJoin('Store', joinMethodName='stores')) + + class StoreStats(SQLObject): class sqlmeta: lazyUpdate = True @@ -631,6 +639,14 @@ managedBroker = StringCol(length=1000, default=None) statsCurr = ForeignKey('JournalStats', cascade='null', default=None) statsPrev = ForeignKey('JournalStats', cascade='null', default=None) + name = StringCol(length=1000, default=None) + queue = ForeignKey('Queue', cascade='null', default=None) + journalDirectory = StringCol(length=1000, default=None) + journalBaseFileName = StringCol(length=1000, default=None) + journalWritePageSize = IntCol(default=None) + journalWritePages = IntCol(default=None) + journalReadPageSize = IntCol(default=None) + journalReadPages = IntCol(default=None) classInfos = dict() # brokerId => classInfo @@ -643,6 +659,9 @@ conn.callMethod(self.idOriginal, classInfo, "expand", callback, args=actualArgs) +Queue.sqlmeta.addJoin(SQLMultipleJoin('Journal', joinMethodName='journals')) + + class JournalStats(SQLObject): class sqlmeta: lazyUpdate = True @@ -650,12 +669,39 @@ idOriginal = BigIntCol(default=None) recTime = TimestampCol(default=None) journal = ForeignKey('Journal', cascade='null', default=None) + initialFileCount = SmallIntCol(default=None) + dataFileSize = IntCol(default=None) + journalCurrentFileCount = IntCol(default=None) + journalRecordDepth = IntCol(default=None) + journalRecordDepthLow = IntCol(default=None) + journalRecordDepthHigh = IntCol(default=None) + journalRecordEnqueues = BigIntCol(default=None) + journalRecordDequeues = BigIntCol(default=None) + journalOutstandingAIOs = IntCol(default=None) + journalOutstandingAIOsLow = IntCol(default=None) + journalOutstandingAIOsHigh = IntCol(default=None) + journalFreeFileCount = IntCol(default=None) + journalFreeFileCountLow = IntCol(default=None) + journalFreeFileCountHigh = IntCol(default=None) + journalAvailableFileCount = IntCol(default=None) + journalAvailableFileCountLow = IntCol(default=None) + journalAvailableFileCountHigh = IntCol(default=None) + journalWriteWaitFailures = BigIntCol(default=None) + journalWriteBusyFailures = BigIntCol(default=None) + journalReadRecordCount = BigIntCol(default=None) + journalReadBusyFailures = BigIntCol(default=None) + journalWritePageCacheDepth = IntCol(default=None) + journalWritePageCacheDepthLow = IntCol(default=None) + journalWritePageCacheDepthHigh = IntCol(default=None) + journalReadPageCacheDepth = IntCol(default=None) + journalReadPageCacheDepthLow = IntCol(default=None) + journalReadPageCacheDepthHigh = IntCol(default=None) classInfos = dict() # brokerId => classInfo Journal.sqlmeta.addJoin(SQLMultipleJoin('JournalStats', joinMethodName='stats')) -classToSchemaNameMap['Store'] = 'store' -schemaNameToClassMap['store'] = Store -classToSchemaNameMap['Journal'] = 'journal' -schemaNameToClassMap['journal'] = Journal +classToSchemaNameMap['Store'] = 'Store' +schemaNameToClassMap['Store'] = Store +classToSchemaNameMap['Journal'] = 'Journal' +schemaNameToClassMap['Journal'] = Journal Modified: mgmt/mint/python/mint/schemaparser.py =================================================================== --- mgmt/mint/python/mint/schemaparser.py 2008-06-04 18:18:39 UTC (rev 2128) +++ mgmt/mint/python/mint/schemaparser.py 2008-06-04 21:20:00 UTC (rev 2129) @@ -80,13 +80,20 @@ self.pythonOutput += " lazyUpdate = %s\n\n" % (lazyUpdate) def generateClassAttribs(self, schemaName, elements): + if (schemaName == "JournalStats"): + print schemaName for elem in elements: # special handling due to name conflict with SqlObject.connection if (elem["@name"] == "connection"): elem["@name"] = "clientConnection" if (elem["@type"] == "objId"): if (elem["@name"].endswith("Ref")): - reference = self.style.dbTableToPythonClass(elem["@references"]) + reference = elem["@references"] + # handle cases where the referenced class is in a different namespace (ie, contains a ".") + namespaceIndex = reference.find(".") + if (namespaceIndex > 0): + reference = reference[namespaceIndex + 1:] + reference = self.style.dbTableToPythonClass(reference) if (reference == "Connection"): reference = "ClientConnection" attrib = reference[0].lower() + reference[1:] Modified: mgmt/mint/sql/schema.sql =================================================================== --- mgmt/mint/sql/schema.sql 2008-06-04 18:18:39 UTC (rev 2128) +++ mgmt/mint/sql/schema.sql 2008-06-04 21:20:00 UTC (rev 2129) @@ -223,14 +223,49 @@ deletion_time TIMESTAMP, managed_broker VARCHAR(1000), stats_curr_id INT, - stats_prev_id INT + stats_prev_id INT, + name VARCHAR(1000), + queue_id INT, + journal_directory VARCHAR(1000), + journal_base_file_name VARCHAR(1000), + journal_write_page_size INT, + journal_write_pages INT, + journal_read_page_size INT, + journal_read_pages INT ); CREATE TABLE journal_stats ( id SERIAL PRIMARY KEY, id_original BIGINT, rec_time TIMESTAMP, - journal_id INT + journal_id INT, + initial_file_count SMALLINT, + data_file_size INT, + journal_current_file_count INT, + journal_record_depth INT, + journal_record_depth_low INT, + journal_record_depth_high INT, + journal_record_enqueues BIGINT, + journal_record_dequeues BIGINT, + journal_outstanding_ai_os INT, + journal_outstanding_ai_os_low INT, + journal_outstanding_ai_os_high INT, + journal_free_file_count INT, + journal_free_file_count_low INT, + journal_free_file_count_high INT, + journal_available_file_count INT, + journal_available_file_count_low INT, + journal_available_file_count_high INT, + journal_write_wait_failures BIGINT, + journal_write_busy_failures BIGINT, + journal_read_record_count BIGINT, + journal_read_busy_failures BIGINT, + journal_write_page_cache_depth INT, + journal_write_page_cache_depth_low INT, + journal_write_page_cache_depth_high INT, + journal_read_page_cache_depth INT, + journal_read_page_cache_depth_low INT, + journal_read_page_cache_depth_high INT ); CREATE TABLE link ( @@ -355,7 +390,12 @@ deletion_time TIMESTAMP, managed_broker VARCHAR(1000), stats_curr_id INT, - stats_prev_id INT + stats_prev_id INT, + broker_id INT, + location VARCHAR(1000), + async BOOL, + default_initial_file_count SMALLINT, + default_data_file_size INT ); CREATE TABLE store_stats ( @@ -473,6 +513,8 @@ ALTER TABLE journal ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES journal_stats (id) ON DELETE SET NULL; +ALTER TABLE journal ADD CONSTRAINT queue_id_exists FOREIGN KEY (queue_id) REFERENCES queue (id) ON DELETE SET NULL; + ALTER TABLE journal_stats ADD CONSTRAINT journal_id_exists FOREIGN KEY (journal_id) REFERENCES journal (id) ON DELETE SET NULL; ALTER TABLE link ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES link_stats (id) ON DELETE SET NULL; @@ -505,6 +547,8 @@ ALTER TABLE store ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES store_stats (id) ON DELETE SET NULL; +ALTER TABLE store ADD CONSTRAINT broker_id_exists FOREIGN KEY (broker_id) REFERENCES broker (id) ON DELETE SET NULL; + ALTER TABLE store_stats ADD CONSTRAINT store_id_exists FOREIGN KEY (store_id) REFERENCES store (id) ON DELETE SET NULL; ALTER TABLE system ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES system_stats (id) ON DELETE SET NULL;

17 years, 11 months

1
0
0 / 0

rhmessaging commits: r2128 - mgmt/cumin/python/cumin.

by rhmessaging-commits＠lists.jboss.org

Author: justi9 Date: 2008-06-04 14:18:39 -0400 (Wed, 04 Jun 2008) New Revision: 2128 Modified: mgmt/cumin/python/cumin/client.py mgmt/cumin/python/cumin/model.py Log: Fix connection close; renames Modified: mgmt/cumin/python/cumin/client.py =================================================================== --- mgmt/cumin/python/cumin/client.py 2008-06-04 18:14:32 UTC (rev 2127) +++ mgmt/cumin/python/cumin/client.py 2008-06-04 18:18:39 UTC (rev 2128) @@ -173,7 +173,7 @@ self.page.set_redirect_url(session, branch.marshal()) def process_item(self, session, id): - conn = Connection.get(id) + conn = ClientConnection.get(id) action = self.app.model.connection.close action.invoke(conn) @@ -181,7 +181,7 @@ return "Close Connections" def render_item_content(self, session, id): - return "Close Connection %s" % Client.get(id).address + return "Close Connection %s" % ClientConnection.get(id).address class ConnectionStatus(CuminStatus): def render_frames_from(self, session, conn): Modified: mgmt/cumin/python/cumin/model.py =================================================================== --- mgmt/cumin/python/cumin/model.py 2008-06-04 18:14:32 UTC (rev 2127) +++ mgmt/cumin/python/cumin/model.py 2008-06-04 18:18:39 UTC (rev 2128) @@ -926,7 +926,7 @@ return "Close" def do_invoke(self, sess, args, completion): - reg = sess.conn.vhost.broker.registration + reg = sess.clientConnection.vhost.broker.registration conn = self.cumin_model.data.getConnectionByRegistration(reg) if sess.name == conn.getSessionId():

17 years, 11 months

1
0
0 / 0

rhmessaging commits: r2127 - mgmt/cumin/python/cumin.

by rhmessaging-commits＠lists.jboss.org

Author: justi9 Date: 2008-06-04 14:14:32 -0400 (Wed, 04 Jun 2008) New Revision: 2127 Modified: mgmt/cumin/python/cumin/queue.py Log: Reenable byte depth Modified: mgmt/cumin/python/cumin/queue.py =================================================================== --- mgmt/cumin/python/cumin/queue.py 2008-06-04 17:05:06 UTC (rev 2126) +++ mgmt/cumin/python/cumin/queue.py 2008-06-04 18:14:32 UTC (rev 2127) @@ -216,8 +216,7 @@ return self.app.model.queue.byteTotalDequeues.rate_html(queue) def render_byte_depth(self, session, queue): - return 9999 - #return self.app.model.queue.byteDepth.value(queue) + return self.app.model.queue.byteDepth.value(queue) def render_byte_depth_accel(self, session, queue): return self.app.model.queue.byteDepth.rate_html(queue)

17 years, 11 months

1
0
0 / 0

rhmessaging commits: r2126 - mgmt/mint.

by rhmessaging-commits＠lists.jboss.org

Author: nunofsantos Date: 2008-06-04 13:05:06 -0400 (Wed, 04 Jun 2008) New Revision: 2126 Modified: mgmt/mint/Makefile Log: echo store schema parsing command line Modified: mgmt/mint/Makefile =================================================================== --- mgmt/mint/Makefile 2008-06-04 15:48:32 UTC (rev 2125) +++ mgmt/mint/Makefile 2008-06-04 17:05:06 UTC (rev 2126) @@ -31,7 +31,7 @@ schema-python: @if [ -z "$$MINT_SCHEMA_XML" ]; then echo "MINT_SCHEMA_XML is not set"; exit 1; fi python python/mint/schemaparser.py ${MINT_SCHEMA_XML} python/mint/schema.py ${dsn} - @if [ -z "$$STORE_SCHEMA_XML" ]; then echo "Warning: STORE_SCHEMA_XML is not set, skipping store schema generation"; else python python/mint/schemaparser.py ${STORE_SCHEMA_XML} python/mint/schema.py ${dsn} append; fi + @if [ -z "$$STORE_SCHEMA_XML" ]; then echo "Warning: STORE_SCHEMA_XML is not set, skipping store schema generation"; else echo "python python/mint/schemaparser.py ${STORE_SCHEMA_XML} python/mint/schema.py ${dsn} append"; python python/mint/schemaparser.py ${STORE_SCHEMA_XML} python/mint/schema.py ${dsn} append; fi schema-sql: sqlobject-admin sql -m mint -m mint.schema -c ${dsn} | sed -e '1,2d' > sql/schema.sql

17 years, 11 months

1
0
0 / 0

rhmessaging commits: r2125 - in mgmt/mint: python/mint and 1 other directories.

by rhmessaging-commits＠lists.jboss.org

Author: nunofsantos Date: 2008-06-04 11:48:32 -0400 (Wed, 04 Jun 2008) New Revision: 2125 Modified: mgmt/mint/Makefile mgmt/mint/python/mint/schema.py mgmt/mint/python/mint/schemaparser.py mgmt/mint/sql/schema.sql Log: add support for store schema Modified: mgmt/mint/Makefile =================================================================== --- mgmt/mint/Makefile 2008-06-04 15:39:43 UTC (rev 2124) +++ mgmt/mint/Makefile 2008-06-04 15:48:32 UTC (rev 2125) @@ -31,8 +31,7 @@ schema-python: @if [ -z "$$MINT_SCHEMA_XML" ]; then echo "MINT_SCHEMA_XML is not set"; exit 1; fi python python/mint/schemaparser.py ${MINT_SCHEMA_XML} python/mint/schema.py ${dsn} -# ignore the store schema for now -# @if [ -z "$$STORE_SCHEMA_XML" ]; then echo "Warning: STORE_SCHEMA_XML is not set, skipping store schema generation"; else python python/mint/schemaparser.py ${STORE_SCHEMA_XML} python/mint/schema-store.py ${dsn}; cat python/mint/schema-store.py >> python/mint/schema.py; rm python/mint/schema-store.py; fi + @if [ -z "$$STORE_SCHEMA_XML" ]; then echo "Warning: STORE_SCHEMA_XML is not set, skipping store schema generation"; else python python/mint/schemaparser.py ${STORE_SCHEMA_XML} python/mint/schema.py ${dsn} append; fi schema-sql: sqlobject-admin sql -m mint -m mint.schema -c ${dsn} | sed -e '1,2d' > sql/schema.sql Modified: mgmt/mint/python/mint/schema.py =================================================================== --- mgmt/mint/python/mint/schema.py 2008-06-04 15:39:43 UTC (rev 2124) +++ mgmt/mint/python/mint/schema.py 2008-06-04 15:48:32 UTC (rev 2125) @@ -590,3 +590,72 @@ schemaNameToClassMap['Bridge'] = Bridge classToSchemaNameMap['Session'] = 'Session' schemaNameToClassMap['Session'] = Session + + + +class Store(SQLObject): + class sqlmeta: + lazyUpdate = True + + idOriginal = BigIntCol(default=None) + recTime = TimestampCol(default=None) + creationTime = TimestampCol(default=None) + deletionTime = TimestampCol(default=None) + managedBroker = StringCol(length=1000, default=None) + statsCurr = ForeignKey('StoreStats', cascade='null', default=None) + statsPrev = ForeignKey('StoreStats', cascade='null', default=None) + + classInfos = dict() # brokerId => classInfo + +class StoreStats(SQLObject): + class sqlmeta: + lazyUpdate = True + + idOriginal = BigIntCol(default=None) + recTime = TimestampCol(default=None) + store = ForeignKey('Store', cascade='null', default=None) + + classInfos = dict() # brokerId => classInfo + +Store.sqlmeta.addJoin(SQLMultipleJoin('StoreStats', joinMethodName='stats')) + + +class Journal(SQLObject): + class sqlmeta: + lazyUpdate = True + + idOriginal = BigIntCol(default=None) + recTime = TimestampCol(default=None) + creationTime = TimestampCol(default=None) + deletionTime = TimestampCol(default=None) + managedBroker = StringCol(length=1000, default=None) + statsCurr = ForeignKey('JournalStats', cascade='null', default=None) + statsPrev = ForeignKey('JournalStats', cascade='null', default=None) + + classInfos = dict() # brokerId => classInfo + + def expand(self, model, callback, by): + """Increase number of files allocated for this journal""" + actualArgs = dict() + actualArgs["by"] = by + conn = model.connections[self.managedBroker] + classInfo = self.classInfos[self.managedBroker] + conn.callMethod(self.idOriginal, classInfo, "expand", + callback, args=actualArgs) + +class JournalStats(SQLObject): + class sqlmeta: + lazyUpdate = True + + idOriginal = BigIntCol(default=None) + recTime = TimestampCol(default=None) + journal = ForeignKey('Journal', cascade='null', default=None) + + classInfos = dict() # brokerId => classInfo + +Journal.sqlmeta.addJoin(SQLMultipleJoin('JournalStats', joinMethodName='stats')) + +classToSchemaNameMap['Store'] = 'store' +schemaNameToClassMap['store'] = Store +classToSchemaNameMap['Journal'] = 'journal' +schemaNameToClassMap['journal'] = Journal Modified: mgmt/mint/python/mint/schemaparser.py =================================================================== --- mgmt/mint/python/mint/schemaparser.py 2008-06-04 15:39:43 UTC (rev 2124) +++ mgmt/mint/python/mint/schemaparser.py 2008-06-04 15:48:32 UTC (rev 2125) @@ -4,18 +4,25 @@ class SchemaParser: """parses broker XML schema""" - def __init__(self, xmlSchemaPath, pythonFilePath, dsn): + def __init__(self, xmlSchemaPath, pythonFilePath, dsn, append=""): self.xmlSchemaPath = xmlSchemaPath self.pythonFilePath = pythonFilePath self.dsn = dsn self.style = MixedCaseUnderscoreStyle() - self.pythonOutput = "import mint\n" - self.pythonOutput += "from sqlobject import *\n" - self.pythonOutput += "from datetime import datetime\n" self.additionalPythonOutput = "" self.currentClass = "" - self.finalPythonOutput = "\nclassToSchemaNameMap = dict()\n" - self.finalPythonOutput += "schemaNameToClassMap = dict()\n" + self.pythonOutput = "" + self.finalPythonOutput = "" + if (append == ""): + self.pythonOutput += "import mint\n" + self.pythonOutput += "from sqlobject import *\n" + self.pythonOutput += "from datetime import datetime\n" + self.finalPythonOutput += "\nclassToSchemaNameMap = dict()\n" + self.finalPythonOutput += "schemaNameToClassMap = dict()\n" + self.append = False + else: + self.pythonOutput += "\n\n" + self.append = True # mapping between xml schema types and database column types # see xml/MintTypes.xml self.dataTypesMap = dict() @@ -162,7 +169,11 @@ self.currentClass = "" def generateCode(self): - outputFile = open(self.pythonFilePath, "w") + if (self.append): + fileFlag = "a" + else: + fileFlag = "w" + outputFile = open(self.pythonFilePath, fileFlag) schema = mllib.xml_parse(self.xmlSchemaPath) classes = schema.query["schema/class"] for cls in classes: @@ -180,8 +191,8 @@ if __name__ == "__main__": import sys - if len(sys.argv) != 4: - print "Usage: schemaparser.py INPUT-XML-SCHEMA OUTPUT-PYTHON-FILE DSN" + if len(sys.argv) not in (4,5): + print "Usage: schemaparser.py INPUT-XML-SCHEMA OUTPUT-PYTHON-FILE DSN [APPEND]" sys.exit(1) else: parser = SchemaParser(*sys.argv[1:]) Modified: mgmt/mint/sql/schema.sql =================================================================== --- mgmt/mint/sql/schema.sql 2008-06-04 15:39:43 UTC (rev 2124) +++ mgmt/mint/sql/schema.sql 2008-06-04 15:48:32 UTC (rev 2125) @@ -215,6 +215,24 @@ byte_routes BIGINT ); +CREATE TABLE journal ( + id SERIAL PRIMARY KEY, + id_original BIGINT, + rec_time TIMESTAMP, + creation_time TIMESTAMP, + deletion_time TIMESTAMP, + managed_broker VARCHAR(1000), + stats_curr_id INT, + stats_prev_id INT +); + +CREATE TABLE journal_stats ( + id SERIAL PRIMARY KEY, + id_original BIGINT, + rec_time TIMESTAMP, + journal_id INT +); + CREATE TABLE link ( id SERIAL PRIMARY KEY, id_original BIGINT, @@ -329,6 +347,24 @@ frames_outstanding INT ); +CREATE TABLE store ( + id SERIAL PRIMARY KEY, + id_original BIGINT, + rec_time TIMESTAMP, + creation_time TIMESTAMP, + deletion_time TIMESTAMP, + managed_broker VARCHAR(1000), + stats_curr_id INT, + stats_prev_id INT +); + +CREATE TABLE store_stats ( + id SERIAL PRIMARY KEY, + id_original BIGINT, + rec_time TIMESTAMP, + store_id INT +); + CREATE TABLE system ( id SERIAL PRIMARY KEY, id_original BIGINT, @@ -433,6 +469,12 @@ ALTER TABLE exchange_stats ADD CONSTRAINT exchange_id_exists FOREIGN KEY (exchange_id) REFERENCES exchange (id) ON DELETE SET NULL; +ALTER TABLE journal ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES journal_stats (id) ON DELETE SET NULL; + +ALTER TABLE journal ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES journal_stats (id) ON DELETE SET NULL; + +ALTER TABLE journal_stats ADD CONSTRAINT journal_id_exists FOREIGN KEY (journal_id) REFERENCES journal (id) ON DELETE SET NULL; + ALTER TABLE link ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES link_stats (id) ON DELETE SET NULL; ALTER TABLE link ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES link_stats (id) ON DELETE SET NULL; @@ -459,6 +501,12 @@ ALTER TABLE session_stats ADD CONSTRAINT session_id_exists FOREIGN KEY (session_id) REFERENCES session (id) ON DELETE SET NULL; +ALTER TABLE store ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES store_stats (id) ON DELETE SET NULL; + +ALTER TABLE store ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES store_stats (id) ON DELETE SET NULL; + +ALTER TABLE store_stats ADD CONSTRAINT store_id_exists FOREIGN KEY (store_id) REFERENCES store (id) ON DELETE SET NULL; + ALTER TABLE system ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES system_stats (id) ON DELETE SET NULL; ALTER TABLE system ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES system_stats (id) ON DELETE SET NULL;

17 years, 11 months

1
0
0 / 0

rhmessaging commits: r2124 - mgmt/cumin/python/cumin.

by rhmessaging-commits＠lists.jboss.org

Author: justi9 Date: 2008-06-04 11:39:43 -0400 (Wed, 04 Jun 2008) New Revision: 2124 Modified: mgmt/cumin/python/cumin/client.strings Log: Fix live updating; just some name changes Modified: mgmt/cumin/python/cumin/client.strings =================================================================== --- mgmt/cumin/python/cumin/client.strings 2008-06-04 15:05:58 UTC (rev 2123) +++ mgmt/cumin/python/cumin/client.strings 2008-06-04 15:39:43 UTC (rev 2124) @@ -91,10 +91,10 @@ </table> </div> <script> - cumin.objectListeners["{id}"] = updateClientStatus, 3000; + cumin.objectListeners["{id}"] = updateConnectionStatus, 3000; </script> -[ClientView.javascript] +[ConnectionView.javascript] function updateConnection(data) { var model = data.objectify(); var conns = model.connection;

17 years, 11 months

1
0
0 / 0

rhmessaging commits: r2123 - store/trunk/cpp/lib.

by rhmessaging-commits＠lists.jboss.org

Author: gordonsim Date: 2008-06-04 11:05:58 -0400 (Wed, 04 Jun 2008) New Revision: 2123 Modified: store/trunk/cpp/lib/JournalImpl.cpp Log: Change to handling of loadContent where requested data is more than is available. Now just return what is available without error. Modified: store/trunk/cpp/lib/JournalImpl.cpp =================================================================== --- store/trunk/cpp/lib/JournalImpl.cpp 2008-06-03 21:59:26 UTC (rev 2122) +++ store/trunk/cpp/lib/JournalImpl.cpp 2008-06-04 15:05:58 UTC (rev 2123) @@ -237,10 +237,10 @@ ::free(_datap); _datap = 0; } - _dlen = 0; - _dtok.reset(); - _dtok.set_wstate(DataTokenImpl::ENQ); - _dtok.set_rid(0); + _dlen = 0; + _dtok.reset(); + _dtok.set_wstate(DataTokenImpl::ENQ); + _dtok.set_rid(0); _external = false; size_t xlen = 0; bool transient = false; @@ -284,11 +284,10 @@ if (_external) return false; if (offset + length > _dlen) { - std::stringstream ss; - ss << "loadMsgContent(): offset + length exceeds available message size"; - throw jexception(0, ss.str().c_str(), "JournalImpl", "loadMsgContent"); + data.append((const char*)_datap + offset, _dlen - offset); + } else { + data.append((const char*)_datap + offset, length); } - data.append((const char*)_datap + offset, length); return true; }

17 years, 11 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

rhmessaging-commits June 2008