rhmessaging commits: r2867 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-11-24 09:15:50 -0500 (Mon, 24 Nov 2008)
New Revision: 2867
Modified:
mgmt/trunk/cumin/python/cumin/job.py
Log:
Changing the way the jobset hold/release/remove href is generated so it will work from system frame as well as grid frame.
Modified: mgmt/trunk/cumin/python/cumin/job.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/job.py 2008-11-21 20:47:57 UTC (rev 2866)
+++ mgmt/trunk/cumin/python/cumin/job.py 2008-11-24 14:15:50 UTC (rev 2867)
@@ -388,7 +388,7 @@
ids = self.parent.ids.get(session)
self.parent.ids.clear(session)
- href = self.frame.jobs_remove.get_href(session, ids)
+ href = self.app.main_page.main.pool.jobs_remove.get_href(session, ids)
self.page.set_redirect_url(session, href)
def render_content(self, session):
@@ -407,7 +407,7 @@
ids = self.parent.ids.get(session)
self.parent.ids.clear(session)
- href = self.frame.jobs_hold.get_href(session, ids)
+ href = self.app.main_page.main.pool.jobs_hold.get_href(session, ids)
self.page.set_redirect_url(session, href)
def render_content(self, session):
@@ -426,7 +426,7 @@
ids = self.parent.ids.get(session)
self.parent.ids.clear(session)
- href = self.frame.jobs_release.get_href(session, ids)
+ href = self.app.main_page.main.pool.jobs_release.get_href(session, ids)
self.page.set_redirect_url(session, href)
def render_content(self, session):
15 years, 6 months
rhmessaging commits: r2866 - store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store.
by rhmessaging-commits＠lists.jboss.org
Author: tedross
Date: 2008-11-21 15:47:57 -0500 (Fri, 21 Nov 2008)
New Revision: 2866
Modified:
store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.cpp
store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.h
store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp
store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.h
Log:
Regenerated QMF files
Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.cpp
===================================================================
--- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.cpp 2008-11-21 17:20:38 UTC (rev 2865)
+++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.cpp 2008-11-21 20:47:57 UTC (rev 2866)
@@ -99,8 +99,8 @@
const string NAME("name");
const string TYPE("type");
const string ACCESS("access");
- const string INDEX("index");
- const string OPTIONAL("optional");
+ const string IS_INDEX("index");
+ const string IS_OPTIONAL("optional");
const string UNIT("unit");
const string MIN("min");
const string MAX("max");
@@ -135,24 +135,24 @@
ft.setString (NAME, "queueRef");
ft.setInt (TYPE, TYPE_REF);
ft.setInt (ACCESS, ACCESS_RO);
- ft.setInt (INDEX, 0);
- ft.setInt (OPTIONAL, 0);
+ ft.setInt (IS_INDEX, 0);
+ ft.setInt (IS_OPTIONAL, 0);
buf.put (ft);
ft = FieldTable ();
ft.setString (NAME, "name");
ft.setInt (TYPE, TYPE_SSTR);
ft.setInt (ACCESS, ACCESS_RO);
- ft.setInt (INDEX, 1);
- ft.setInt (OPTIONAL, 0);
+ ft.setInt (IS_INDEX, 1);
+ ft.setInt (IS_OPTIONAL, 0);
buf.put (ft);
ft = FieldTable ();
ft.setString (NAME, "directory");
ft.setInt (TYPE, TYPE_SSTR);
ft.setInt (ACCESS, ACCESS_RO);
- ft.setInt (INDEX, 0);
- ft.setInt (OPTIONAL, 0);
+ ft.setInt (IS_INDEX, 0);
+ ft.setInt (IS_OPTIONAL, 0);
ft.setString (DESC, "Directory containing journal files");
buf.put (ft);
@@ -160,8 +160,8 @@
ft.setString (NAME, "baseFileName");
ft.setInt (TYPE, TYPE_SSTR);
ft.setInt (ACCESS, ACCESS_RO);
- ft.setInt (INDEX, 0);
- ft.setInt (OPTIONAL, 0);
+ ft.setInt (IS_INDEX, 0);
+ ft.setInt (IS_OPTIONAL, 0);
ft.setString (DESC, "Base filename prefix for journal");
buf.put (ft);
@@ -169,8 +169,8 @@
ft.setString (NAME, "writePageSize");
ft.setInt (TYPE, TYPE_U32);
ft.setInt (ACCESS, ACCESS_RO);
- ft.setInt (INDEX, 0);
- ft.setInt (OPTIONAL, 0);
+ ft.setInt (IS_INDEX, 0);
+ ft.setInt (IS_OPTIONAL, 0);
ft.setString (UNIT, "byte");
ft.setString (DESC, "Page size in write-page-cache");
buf.put (ft);
@@ -179,8 +179,8 @@
ft.setString (NAME, "writePages");
ft.setInt (TYPE, TYPE_U32);
ft.setInt (ACCESS, ACCESS_RO);
- ft.setInt (INDEX, 0);
- ft.setInt (OPTIONAL, 0);
+ ft.setInt (IS_INDEX, 0);
+ ft.setInt (IS_OPTIONAL, 0);
ft.setString (UNIT, "wpage");
ft.setString (DESC, "Number of pages in write-page-cache");
buf.put (ft);
@@ -189,8 +189,8 @@
ft.setString (NAME, "readPageSize");
ft.setInt (TYPE, TYPE_U32);
ft.setInt (ACCESS, ACCESS_RO);
- ft.setInt (INDEX, 0);
- ft.setInt (OPTIONAL, 0);
+ ft.setInt (IS_INDEX, 0);
+ ft.setInt (IS_OPTIONAL, 0);
ft.setString (UNIT, "byte");
ft.setString (DESC, "Page size in read-page-cache");
buf.put (ft);
@@ -199,8 +199,8 @@
ft.setString (NAME, "readPages");
ft.setInt (TYPE, TYPE_U32);
ft.setInt (ACCESS, ACCESS_RO);
- ft.setInt (INDEX, 0);
- ft.setInt (OPTIONAL, 0);
+ ft.setInt (IS_INDEX, 0);
+ ft.setInt (IS_OPTIONAL, 0);
ft.setString (UNIT, "rpage");
ft.setString (DESC, "Number of pages in read-page-cache");
buf.put (ft);
@@ -209,8 +209,8 @@
ft.setString (NAME, "initialFileCount");
ft.setInt (TYPE, TYPE_U16);
ft.setInt (ACCESS, ACCESS_RO);
- ft.setInt (INDEX, 0);
- ft.setInt (OPTIONAL, 0);
+ ft.setInt (IS_INDEX, 0);
+ ft.setInt (IS_OPTIONAL, 0);
ft.setString (UNIT, "file");
ft.setString (DESC, "Number of files initially allocated to this journal");
buf.put (ft);
@@ -219,8 +219,8 @@
ft.setString (NAME, "dataFileSize");
ft.setInt (TYPE, TYPE_U32);
ft.setInt (ACCESS, ACCESS_RO);
- ft.setInt (INDEX, 0);
- ft.setInt (OPTIONAL, 0);
+ ft.setInt (IS_INDEX, 0);
+ ft.setInt (IS_OPTIONAL, 0);
ft.setString (UNIT, "byte");
ft.setString (DESC, "Size of each journal data file");
buf.put (ft);
@@ -229,8 +229,8 @@
ft.setString (NAME, "currentFileCount");
ft.setInt (TYPE, TYPE_U32);
ft.setInt (ACCESS, ACCESS_RO);
- ft.setInt (INDEX, 0);
- ft.setInt (OPTIONAL, 0);
+ ft.setInt (IS_INDEX, 0);
+ ft.setInt (IS_OPTIONAL, 0);
ft.setString (UNIT, "file");
ft.setString (DESC, "Number of files currently allocated to this journal");
buf.put (ft);
Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.h
===================================================================
--- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.h 2008-11-21 17:20:38 UTC (rev 2865)
+++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.h 2008-11-21 20:47:57 UTC (rev 2866)
@@ -150,6 +150,7 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
queueRef = val;
configChanged = true;
+ setUpdateTime();
}
inline const ::qpid::management::ObjectId& get_queueRef() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -159,6 +160,7 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
name = val;
configChanged = true;
+ setUpdateTime();
}
inline const std::string& get_name() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -168,6 +170,7 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
directory = val;
configChanged = true;
+ setUpdateTime();
}
inline const std::string& get_directory() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -177,6 +180,7 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
baseFileName = val;
configChanged = true;
+ setUpdateTime();
}
inline const std::string& get_baseFileName() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -186,6 +190,7 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
writePageSize = val;
configChanged = true;
+ setUpdateTime();
}
inline uint32_t get_writePageSize() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -195,6 +200,7 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
writePages = val;
configChanged = true;
+ setUpdateTime();
}
inline uint32_t get_writePages() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -204,6 +210,7 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
readPageSize = val;
configChanged = true;
+ setUpdateTime();
}
inline uint32_t get_readPageSize() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -213,6 +220,7 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
readPages = val;
configChanged = true;
+ setUpdateTime();
}
inline uint32_t get_readPages() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -222,6 +230,7 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
initialFileCount = val;
configChanged = true;
+ setUpdateTime();
}
inline uint16_t get_initialFileCount() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -231,6 +240,7 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
dataFileSize = val;
configChanged = true;
+ setUpdateTime();
}
inline uint32_t get_dataFileSize() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -240,6 +250,7 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
currentFileCount = val;
configChanged = true;
+ setUpdateTime();
}
inline uint32_t get_currentFileCount() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -251,6 +262,7 @@
if (recordDepthHigh < recordDepth)
recordDepthHigh = recordDepth;
instChanged = true;
+ setUpdateTime();
}
inline void dec_recordDepth (uint32_t by = 1) {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -258,54 +270,67 @@
if (recordDepthLow > recordDepth)
recordDepthLow = recordDepth;
instChanged = true;
+ setUpdateTime();
}
inline void inc_enqueues (uint64_t by = 1) {
getThreadStats()->enqueues += by;
instChanged = true;
+ setUpdateTime();
}
inline void dec_enqueues (uint64_t by = 1) {
getThreadStats()->enqueues -= by;
instChanged = true;
+ setUpdateTime();
}
inline void inc_dequeues (uint64_t by = 1) {
getThreadStats()->dequeues += by;
instChanged = true;
+ setUpdateTime();
}
inline void dec_dequeues (uint64_t by = 1) {
getThreadStats()->dequeues -= by;
instChanged = true;
+ setUpdateTime();
}
inline void inc_txnEnqueues (uint64_t by = 1) {
getThreadStats()->txnEnqueues += by;
instChanged = true;
+ setUpdateTime();
}
inline void dec_txnEnqueues (uint64_t by = 1) {
getThreadStats()->txnEnqueues -= by;
instChanged = true;
+ setUpdateTime();
}
inline void inc_txnDequeues (uint64_t by = 1) {
getThreadStats()->txnDequeues += by;
instChanged = true;
+ setUpdateTime();
}
inline void dec_txnDequeues (uint64_t by = 1) {
getThreadStats()->txnDequeues -= by;
instChanged = true;
+ setUpdateTime();
}
inline void inc_txnCommits (uint64_t by = 1) {
getThreadStats()->txnCommits += by;
instChanged = true;
+ setUpdateTime();
}
inline void dec_txnCommits (uint64_t by = 1) {
getThreadStats()->txnCommits -= by;
instChanged = true;
+ setUpdateTime();
}
inline void inc_txnAborts (uint64_t by = 1) {
getThreadStats()->txnAborts += by;
instChanged = true;
+ setUpdateTime();
}
inline void dec_txnAborts (uint64_t by = 1) {
getThreadStats()->txnAborts -= by;
instChanged = true;
+ setUpdateTime();
}
inline void inc_outstandingAIOs (uint32_t by = 1) {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -313,6 +338,7 @@
if (outstandingAIOsHigh < outstandingAIOs)
outstandingAIOsHigh = outstandingAIOs;
instChanged = true;
+ setUpdateTime();
}
inline void dec_outstandingAIOs (uint32_t by = 1) {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -320,6 +346,7 @@
if (outstandingAIOsLow > outstandingAIOs)
outstandingAIOsLow = outstandingAIOs;
instChanged = true;
+ setUpdateTime();
}
inline void inc_freeFileCount (uint32_t by = 1) {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -327,6 +354,7 @@
if (freeFileCountHigh < freeFileCount)
freeFileCountHigh = freeFileCount;
instChanged = true;
+ setUpdateTime();
}
inline void dec_freeFileCount (uint32_t by = 1) {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -334,6 +362,7 @@
if (freeFileCountLow > freeFileCount)
freeFileCountLow = freeFileCount;
instChanged = true;
+ setUpdateTime();
}
inline void inc_availableFileCount (uint32_t by = 1) {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -341,6 +370,7 @@
if (availableFileCountHigh < availableFileCount)
availableFileCountHigh = availableFileCount;
instChanged = true;
+ setUpdateTime();
}
inline void dec_availableFileCount (uint32_t by = 1) {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -348,38 +378,47 @@
if (availableFileCountLow > availableFileCount)
availableFileCountLow = availableFileCount;
instChanged = true;
+ setUpdateTime();
}
inline void inc_writeWaitFailures (uint64_t by = 1) {
getThreadStats()->writeWaitFailures += by;
instChanged = true;
+ setUpdateTime();
}
inline void dec_writeWaitFailures (uint64_t by = 1) {
getThreadStats()->writeWaitFailures -= by;
instChanged = true;
+ setUpdateTime();
}
inline void inc_writeBusyFailures (uint64_t by = 1) {
getThreadStats()->writeBusyFailures += by;
instChanged = true;
+ setUpdateTime();
}
inline void dec_writeBusyFailures (uint64_t by = 1) {
getThreadStats()->writeBusyFailures -= by;
instChanged = true;
+ setUpdateTime();
}
inline void inc_readRecordCount (uint64_t by = 1) {
getThreadStats()->readRecordCount += by;
instChanged = true;
+ setUpdateTime();
}
inline void dec_readRecordCount (uint64_t by = 1) {
getThreadStats()->readRecordCount -= by;
instChanged = true;
+ setUpdateTime();
}
inline void inc_readBusyFailures (uint64_t by = 1) {
getThreadStats()->readBusyFailures += by;
instChanged = true;
+ setUpdateTime();
}
inline void dec_readBusyFailures (uint64_t by = 1) {
getThreadStats()->readBusyFailures -= by;
instChanged = true;
+ setUpdateTime();
}
inline void inc_writePageCacheDepth (uint32_t by = 1) {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -387,6 +426,7 @@
if (writePageCacheDepthHigh < writePageCacheDepth)
writePageCacheDepthHigh = writePageCacheDepth;
instChanged = true;
+ setUpdateTime();
}
inline void dec_writePageCacheDepth (uint32_t by = 1) {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -394,6 +434,7 @@
if (writePageCacheDepthLow > writePageCacheDepth)
writePageCacheDepthLow = writePageCacheDepth;
instChanged = true;
+ setUpdateTime();
}
inline void inc_readPageCacheDepth (uint32_t by = 1) {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -401,6 +442,7 @@
if (readPageCacheDepthHigh < readPageCacheDepth)
readPageCacheDepthHigh = readPageCacheDepth;
instChanged = true;
+ setUpdateTime();
}
inline void dec_readPageCacheDepth (uint32_t by = 1) {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -408,6 +450,7 @@
if (readPageCacheDepthLow > readPageCacheDepth)
readPageCacheDepthLow = readPageCacheDepth;
instChanged = true;
+ setUpdateTime();
}
};
Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp
===================================================================
--- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp 2008-11-21 17:20:38 UTC (rev 2865)
+++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp 2008-11-21 20:47:57 UTC (rev 2866)
@@ -85,8 +85,8 @@
const string NAME("name");
const string TYPE("type");
const string ACCESS("access");
- const string INDEX("index");
- const string OPTIONAL("optional");
+ const string IS_INDEX("index");
+ const string IS_OPTIONAL("optional");
const string UNIT("unit");
const string MIN("min");
const string MAX("max");
@@ -121,16 +121,16 @@
ft.setString (NAME, "brokerRef");
ft.setInt (TYPE, TYPE_REF);
ft.setInt (ACCESS, ACCESS_RO);
- ft.setInt (INDEX, 1);
- ft.setInt (OPTIONAL, 0);
+ ft.setInt (IS_INDEX, 1);
+ ft.setInt (IS_OPTIONAL, 0);
buf.put (ft);
ft = FieldTable ();
ft.setString (NAME, "location");
ft.setInt (TYPE, TYPE_SSTR);
ft.setInt (ACCESS, ACCESS_RO);
- ft.setInt (INDEX, 0);
- ft.setInt (OPTIONAL, 0);
+ ft.setInt (IS_INDEX, 0);
+ ft.setInt (IS_OPTIONAL, 0);
ft.setString (DESC, "Logical directory on disk");
buf.put (ft);
@@ -138,8 +138,8 @@
ft.setString (NAME, "defaultInitialFileCount");
ft.setInt (TYPE, TYPE_U16);
ft.setInt (ACCESS, ACCESS_RO);
- ft.setInt (INDEX, 0);
- ft.setInt (OPTIONAL, 0);
+ ft.setInt (IS_INDEX, 0);
+ ft.setInt (IS_OPTIONAL, 0);
ft.setString (UNIT, "file");
ft.setString (DESC, "Default number of files initially allocated to each journal");
buf.put (ft);
@@ -148,8 +148,8 @@
ft.setString (NAME, "defaultDataFileSize");
ft.setInt (TYPE, TYPE_U32);
ft.setInt (ACCESS, ACCESS_RO);
- ft.setInt (INDEX, 0);
- ft.setInt (OPTIONAL, 0);
+ ft.setInt (IS_INDEX, 0);
+ ft.setInt (IS_OPTIONAL, 0);
ft.setString (UNIT, "RdPg");
ft.setString (DESC, "Default size of each journal data file");
buf.put (ft);
@@ -158,8 +158,8 @@
ft.setString (NAME, "tplIsInitialized");
ft.setInt (TYPE, TYPE_BOOL);
ft.setInt (ACCESS, ACCESS_RO);
- ft.setInt (INDEX, 0);
- ft.setInt (OPTIONAL, 0);
+ ft.setInt (IS_INDEX, 0);
+ ft.setInt (IS_OPTIONAL, 0);
ft.setString (DESC, "Transaction prepared list has been initialized by a transactional prepare");
buf.put (ft);
@@ -167,8 +167,8 @@
ft.setString (NAME, "tplDirectory");
ft.setInt (TYPE, TYPE_SSTR);
ft.setInt (ACCESS, ACCESS_RO);
- ft.setInt (INDEX, 0);
- ft.setInt (OPTIONAL, 0);
+ ft.setInt (IS_INDEX, 0);
+ ft.setInt (IS_OPTIONAL, 0);
ft.setString (DESC, "Transaction prepared list directory");
buf.put (ft);
@@ -176,8 +176,8 @@
ft.setString (NAME, "tplWritePageSize");
ft.setInt (TYPE, TYPE_U32);
ft.setInt (ACCESS, ACCESS_RO);
- ft.setInt (INDEX, 0);
- ft.setInt (OPTIONAL, 0);
+ ft.setInt (IS_INDEX, 0);
+ ft.setInt (IS_OPTIONAL, 0);
ft.setString (UNIT, "byte");
ft.setString (DESC, "Page size in transaction prepared list write-page-cache");
buf.put (ft);
@@ -186,8 +186,8 @@
ft.setString (NAME, "tplWritePages");
ft.setInt (TYPE, TYPE_U32);
ft.setInt (ACCESS, ACCESS_RO);
- ft.setInt (INDEX, 0);
- ft.setInt (OPTIONAL, 0);
+ ft.setInt (IS_INDEX, 0);
+ ft.setInt (IS_OPTIONAL, 0);
ft.setString (UNIT, "wpage");
ft.setString (DESC, "Number of pages in transaction prepared list write-page-cache");
buf.put (ft);
@@ -196,8 +196,8 @@
ft.setString (NAME, "tplInitialFileCount");
ft.setInt (TYPE, TYPE_U16);
ft.setInt (ACCESS, ACCESS_RO);
- ft.setInt (INDEX, 0);
- ft.setInt (OPTIONAL, 0);
+ ft.setInt (IS_INDEX, 0);
+ ft.setInt (IS_OPTIONAL, 0);
ft.setString (UNIT, "file");
ft.setString (DESC, "Number of files initially allocated to transaction prepared list journal");
buf.put (ft);
@@ -206,8 +206,8 @@
ft.setString (NAME, "tplDataFileSize");
ft.setInt (TYPE, TYPE_U32);
ft.setInt (ACCESS, ACCESS_RO);
- ft.setInt (INDEX, 0);
- ft.setInt (OPTIONAL, 0);
+ ft.setInt (IS_INDEX, 0);
+ ft.setInt (IS_OPTIONAL, 0);
ft.setString (UNIT, "byte");
ft.setString (DESC, "Size of each journal data file in transaction prepared list journal");
buf.put (ft);
@@ -216,8 +216,8 @@
ft.setString (NAME, "tplCurrentFileCount");
ft.setInt (TYPE, TYPE_U32);
ft.setInt (ACCESS, ACCESS_RO);
- ft.setInt (INDEX, 0);
- ft.setInt (OPTIONAL, 0);
+ ft.setInt (IS_INDEX, 0);
+ ft.setInt (IS_OPTIONAL, 0);
ft.setString (UNIT, "file");
ft.setString (DESC, "Number of files currently allocated to transaction prepared list journal");
buf.put (ft);
Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.h
===================================================================
--- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.h 2008-11-21 17:20:38 UTC (rev 2865)
+++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.h 2008-11-21 20:47:57 UTC (rev 2866)
@@ -122,6 +122,7 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
brokerRef = val;
configChanged = true;
+ setUpdateTime();
}
inline const ::qpid::management::ObjectId& get_brokerRef() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -131,6 +132,7 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
location = val;
configChanged = true;
+ setUpdateTime();
}
inline const std::string& get_location() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -140,6 +142,7 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
defaultInitialFileCount = val;
configChanged = true;
+ setUpdateTime();
}
inline uint16_t get_defaultInitialFileCount() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -149,6 +152,7 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
defaultDataFileSize = val;
configChanged = true;
+ setUpdateTime();
}
inline uint32_t get_defaultDataFileSize() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -158,6 +162,7 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
tplIsInitialized = val;
configChanged = true;
+ setUpdateTime();
}
inline uint8_t get_tplIsInitialized() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -167,6 +172,7 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
tplDirectory = val;
configChanged = true;
+ setUpdateTime();
}
inline const std::string& get_tplDirectory() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -176,6 +182,7 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
tplWritePageSize = val;
configChanged = true;
+ setUpdateTime();
}
inline uint32_t get_tplWritePageSize() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -185,6 +192,7 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
tplWritePages = val;
configChanged = true;
+ setUpdateTime();
}
inline uint32_t get_tplWritePages() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -194,6 +202,7 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
tplInitialFileCount = val;
configChanged = true;
+ setUpdateTime();
}
inline uint16_t get_tplInitialFileCount() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -203,6 +212,7 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
tplDataFileSize = val;
configChanged = true;
+ setUpdateTime();
}
inline uint32_t get_tplDataFileSize() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -212,6 +222,7 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
tplCurrentFileCount = val;
configChanged = true;
+ setUpdateTime();
}
inline uint32_t get_tplCurrentFileCount() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -223,6 +234,7 @@
if (tplTransactionDepthHigh < tplTransactionDepth)
tplTransactionDepthHigh = tplTransactionDepth;
instChanged = true;
+ setUpdateTime();
}
inline void dec_tplTransactionDepth (uint32_t by = 1) {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -230,30 +242,37 @@
if (tplTransactionDepthLow > tplTransactionDepth)
tplTransactionDepthLow = tplTransactionDepth;
instChanged = true;
+ setUpdateTime();
}
inline void inc_tplTxnPrepares (uint64_t by = 1) {
getThreadStats()->tplTxnPrepares += by;
instChanged = true;
+ setUpdateTime();
}
inline void dec_tplTxnPrepares (uint64_t by = 1) {
getThreadStats()->tplTxnPrepares -= by;
instChanged = true;
+ setUpdateTime();
}
inline void inc_tplTxnCommits (uint64_t by = 1) {
getThreadStats()->tplTxnCommits += by;
instChanged = true;
+ setUpdateTime();
}
inline void dec_tplTxnCommits (uint64_t by = 1) {
getThreadStats()->tplTxnCommits -= by;
instChanged = true;
+ setUpdateTime();
}
inline void inc_tplTxnAborts (uint64_t by = 1) {
getThreadStats()->tplTxnAborts += by;
instChanged = true;
+ setUpdateTime();
}
inline void dec_tplTxnAborts (uint64_t by = 1) {
getThreadStats()->tplTxnAborts -= by;
instChanged = true;
+ setUpdateTime();
}
inline void inc_tplOutstandingAIOs (uint32_t by = 1) {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -261,6 +280,7 @@
if (tplOutstandingAIOsHigh < tplOutstandingAIOs)
tplOutstandingAIOsHigh = tplOutstandingAIOs;
instChanged = true;
+ setUpdateTime();
}
inline void dec_tplOutstandingAIOs (uint32_t by = 1) {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -268,6 +288,7 @@
if (tplOutstandingAIOsLow > tplOutstandingAIOs)
tplOutstandingAIOsLow = tplOutstandingAIOs;
instChanged = true;
+ setUpdateTime();
}
};
15 years, 7 months
rhmessaging commits: r2865 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-11-21 12:20:38 -0500 (Fri, 21 Nov 2008)
New Revision: 2865
Modified:
mgmt/trunk/cumin/python/cumin/page.py
Log:
Test if session.user_session exists before using. For cumin-bench.
Modified: mgmt/trunk/cumin/python/cumin/page.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/page.py 2008-11-21 17:06:53 UTC (rev 2864)
+++ mgmt/trunk/cumin/python/cumin/page.py 2008-11-21 17:20:38 UTC (rev 2865)
@@ -243,7 +243,10 @@
return "Your Grid Jobs %s" % fmt_count(self.get_item_count(session))
def render_sql_where(self, session, *args):
- user = session.user_session.subject.name
+ if hasattr(session, "user_session"):
+ user = session.user_session.subject.name
+ else:
+ user = ""
elems = list()
elems.append("b.name like '%s%s'" % (user, "%"))
elems.append(self.get_phase_sql(session))
@@ -256,7 +259,8 @@
return self.get_request_visible_columns(session, ["custom_group", "scheduler"])
def render_user(self, session, *args):
- return session.user_session.subject.name
+ if hasattr(session, "user_session"):
+ return session.user_session.subject.name
class MessagingView(TabbedModeSet):
def __init__(self, app, name):
15 years, 7 months
rhmessaging commits: r2864 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-11-21 12:06:53 -0500 (Fri, 21 Nov 2008)
New Revision: 2864
Modified:
mgmt/trunk/cumin/python/cumin/system.py
Log:
Pass the correct number of arguments to get_field_tuples
Modified: mgmt/trunk/cumin/python/cumin/system.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/system.py 2008-11-21 17:03:19 UTC (rev 2863)
+++ mgmt/trunk/cumin/python/cumin/system.py 2008-11-21 17:06:53 UTC (rev 2864)
@@ -96,7 +96,7 @@
def get_sticky_info(self, session):
action = self.app.model.system.slots
- return action.get_field_tuples()
+ return action.get_field_tuples(session)
class SystemView(CuminView):
def __init__(self, app, name):
15 years, 7 months
rhmessaging commits: r2863 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-11-21 12:03:19 -0500 (Fri, 21 Nov 2008)
New Revision: 2863
Modified:
mgmt/trunk/cumin/python/cumin/job.strings
Log:
Automatically update the job output every 5 seconds when viewing the tail.
Modified: mgmt/trunk/cumin/python/cumin/job.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/job.strings 2008-11-21 16:22:37 UTC (rev 2862)
+++ mgmt/trunk/cumin/python/cumin/job.strings 2008-11-21 17:03:19 UTC (rev 2863)
@@ -356,8 +356,10 @@
}
function outputEnd() {
var tarea = document.getElementById("job_output");
- if (tarea)
+ if (tarea) {
scrollToEnd(tarea);
+ setTimeout("get_job_output()", 5000);
+ }
}
[JobOutput.html]
15 years, 7 months
rhmessaging commits: r2862 - store/branches/java/broker-queue-refactor/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb.
by rhmessaging-commits＠lists.jboss.org
Author: aidanskinner
Date: 2008-11-21 11:22:37 -0500 (Fri, 21 Nov 2008)
New Revision: 2862
Modified:
store/branches/java/broker-queue-refactor/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
Log:
RHM-7: Make sure that important state variable manipulation happens while holding the _lock in CommitThread. Make sure all waits time out after a while and recheck their state, rather than potentially locking up.
Modified: store/branches/java/broker-queue-refactor/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
===================================================================
--- store/branches/java/broker-queue-refactor/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java 2008-11-21 16:06:42 UTC (rev 2861)
+++ store/branches/java/broker-queue-refactor/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java 2008-11-21 16:22:37 UTC (rev 2862)
@@ -1800,7 +1800,7 @@
{
try
{
- wait();
+ wait(250);
}
catch (InterruptedException e)
{
@@ -1847,22 +1847,23 @@
{
while (!_stopped.get())
{
- try
+ synchronized (_lock)
{
- synchronized (_lock)
+ while (!_stopped.get() && !hasJobs())
{
- while (!_stopped.get() && !hasJobs())
+ try
{
- _lock.wait();
+ // RHM-7 Periodically wake up and check, just in case we
+ // missed a notification. Don't want to lock the broker hard.
+ _lock.wait(250);
}
+ catch (InterruptedException e)
+ {
+ // _log.info(getName() + " interrupted. ");
+ }
}
- processJobs();
-
}
- catch (InterruptedException e)
- {
- // _log.info(getName() + " interrupted. ");
- }
+ processJobs();
}
}
@@ -1901,18 +1902,18 @@
public void addJob(Commit commit)
{
- _jobQueue.get().add(commit);
synchronized (_lock)
{
+ _jobQueue.get().add(commit);
_lock.notifyAll();
}
}
public void close()
{
- _stopped.set(true);
synchronized (_lock)
{
+ _stopped.set(true);
_lock.notifyAll();
}
}
15 years, 7 months
rhmessaging commits: r2861 - mgmt/trunk/mint/python/mint.
by rhmessaging-commits＠lists.jboss.org
Author: nunofsantos
Date: 2008-11-21 11:06:42 -0500 (Fri, 21 Nov 2008)
New Revision: 2861
Modified:
mgmt/trunk/mint/python/mint/update.py
Log:
commit if queue is empty
Modified: mgmt/trunk/mint/python/mint/update.py
===================================================================
--- mgmt/trunk/mint/python/mint/update.py 2008-11-21 15:59:33 UTC (rev 2860)
+++ mgmt/trunk/mint/python/mint/update.py 2008-11-21 16:06:42 UTC (rev 2861)
@@ -58,7 +58,7 @@
try:
update.process(self.model, conn)
- if self.model.cache.isDirty() and (self.dequeueCount % self.commitThreshold == 0 or self.updates.qsize() == 0):
+ if self.dequeueCount % self.commitThreshold == 0 or self.updates.qsize() == 0:
# commit only every "commitThreshold" updates, or whenever the update queue is empty
conn.commit()
self.model.cache.commit()
15 years, 7 months
rhmessaging commits: r2860 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-11-21 10:59:33 -0500 (Fri, 21 Nov 2008)
New Revision: 2860
Modified:
mgmt/trunk/cumin/python/cumin/page.py
mgmt/trunk/cumin/python/cumin/page.strings
Log:
Adding some text to clarify which jobs are in the MyJobs list.
Modified: mgmt/trunk/cumin/python/cumin/page.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/page.py 2008-11-21 15:51:43 UTC (rev 2859)
+++ mgmt/trunk/cumin/python/cumin/page.py 2008-11-21 15:59:33 UTC (rev 2860)
@@ -255,6 +255,9 @@
def get_visible_columns(self, session):
return self.get_request_visible_columns(session, ["custom_group", "scheduler"])
+ def render_user(self, session, *args):
+ return session.user_session.subject.name
+
class MessagingView(TabbedModeSet):
def __init__(self, app, name):
super(MessagingView, self).__init__(app, name)
Modified: mgmt/trunk/cumin/python/cumin/page.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/page.strings 2008-11-21 15:51:43 UTC (rev 2859)
+++ mgmt/trunk/cumin/python/cumin/page.strings 2008-11-21 15:59:33 UTC (rev 2860)
@@ -231,6 +231,7 @@
[MyGridJobs.html]
<div class="rfloat">{phase}</div>
+ Jobs submitted by {user}
<form id="{id}" style="clear:right;" method="post" action="?">
<div class="sactions">
15 years, 7 months
rhmessaging commits: r2859 - mgmt/trunk/mint/python/mint.
by rhmessaging-commits＠lists.jboss.org
Author: nunofsantos
Date: 2008-11-21 10:51:43 -0500 (Fri, 21 Nov 2008)
New Revision: 2859
Modified:
mgmt/trunk/mint/python/mint/__init__.py
Log:
change handling of class keys to reflect new string representation in qmf.console
Modified: mgmt/trunk/mint/python/mint/__init__.py
===================================================================
--- mgmt/trunk/mint/python/mint/__init__.py 2008-11-21 15:40:40 UTC (rev 2858)
+++ mgmt/trunk/mint/python/mint/__init__.py 2008-11-21 15:51:43 UTC (rev 2859)
@@ -12,6 +12,7 @@
from mint.schema import *
from mint import update
from mint.cache import MintCache
+from qmf.console import ClassKey
log = logging.getLogger("mint")
@@ -436,7 +437,7 @@
finally:
self.unlock()
- seq = self.mgmtSession._sendMethodRequest(broker, classKey, objId, methodName, args)
+ seq = self.mgmtSession._sendMethodRequest(broker, ClassKey(classKey), objId, methodName, args)
if seq is not None:
self.lock()
15 years, 7 months
rhmessaging commits: r2858 - mgmt/trunk/mint/python/mint.
by rhmessaging-commits＠lists.jboss.org
Author: nunofsantos
Date: 2008-11-21 10:40:40 -0500 (Fri, 21 Nov 2008)
New Revision: 2858
Modified:
mgmt/trunk/mint/python/mint/__init__.py
mgmt/trunk/mint/python/mint/update.py
Log:
change handling of class keys to reflect new string representation in qmf.console
Modified: mgmt/trunk/mint/python/mint/__init__.py
===================================================================
--- mgmt/trunk/mint/python/mint/__init__.py 2008-11-20 23:07:47 UTC (rev 2857)
+++ mgmt/trunk/mint/python/mint/__init__.py 2008-11-21 15:40:40 UTC (rev 2858)
@@ -350,9 +350,7 @@
self.connCloseListener = connCloseListener
def __pythonValueToDB(self, key, value):
- if key == "qmfClassKey":
- value = u"'%s'" % unicode(value, "raw_unicode_escape").replace("'", "''")
- elif type(value) == types.DictType:
+ if type(value) == types.DictType:
value = u"'%s'" % pickle.dumps(value).replace("'", "''")
elif value is None:
value = "NULL"
@@ -438,8 +436,7 @@
finally:
self.unlock()
- pname, cname, hash = classKey.split(", ")
- seq = self.mgmtSession._sendMethodRequest(broker, (pname, cname, hash), objId, methodName, args)
+ seq = self.mgmtSession._sendMethodRequest(broker, classKey, objId, methodName, args)
if seq is not None:
self.lock()
@@ -486,7 +483,7 @@
def objectProps(self, broker, record):
""" Invoked when an object is updated. """
- if record.getClassKey()[1] == "job":
+ if record.getClassKey().getClassName() == "job":
priority = 1
else:
priority = 0
@@ -494,7 +491,7 @@
def objectStats(self, broker, record):
""" Invoked when an object is updated. """
- if record.getClassKey()[1] == "job":
+ if record.getClassKey().getClassName() == "job":
priority = 1
else:
priority = 0
Modified: mgmt/trunk/mint/python/mint/update.py
===================================================================
--- mgmt/trunk/mint/python/mint/update.py 2008-11-20 23:07:47 UTC (rev 2857)
+++ mgmt/trunk/mint/python/mint/update.py 2008-11-21 15:40:40 UTC (rev 2858)
@@ -28,6 +28,8 @@
self.enqueueCount = 0
self.dequeueCount = 0
+ self.commitThreshold = 100
+
def enqueue(self, update, priority=0):
try:
self.updates.put((priority, update))
@@ -56,7 +58,8 @@
try:
update.process(self.model, conn)
- if self.dequeueCount % 100 == 0:
+ if self.model.cache.isDirty() and (self.dequeueCount % self.commitThreshold == 0 or self.updates.qsize() == 0):
+ # commit only every "commitThreshold" updates, or whenever the update queue is empty
conn.commit()
self.model.cache.commit()
except:
@@ -130,8 +133,8 @@
ModelUpdate.__init__(self, broker, obj)
def process(self, model, conn):
- pkg, cls, hash = self.qmfObj.getClassKey()
- origCls = cls
+ clsKey = self.qmfObj.getClassKey()
+ origCls = cls = clsKey.getClassName()
if cls in mint.schema.schemaReservedWordsMap:
cls = mint.schema.schemaReservedWordsMap.get(cls)
cls = cls[0].upper()+cls[1:]
@@ -162,7 +165,7 @@
attrs["sourceScopeId"] = idFirst
attrs["sourceObjectId"] = idSecond
- attrs["qmfClassKey"] = "%s, %s, %s" % (pkg, origCls, hash)
+ attrs["qmfClassKey"] = clsKey
attrs["managedBroker"] = str(self.broker.getBrokerId())
cursor = conn.cursor()
@@ -215,9 +218,7 @@
ModelUpdate.__init__(self, broker, obj)
def process(self, model, conn):
- pkg, cls, hash = self.qmfObj.getClassKey()
-
- origCls = cls
+ origCls = cls = self.qmfObj.getClassKey().getClassName()
if cls in mint.schema.schemaReservedWordsMap:
cls = mint.schema.schemaReservedWordsMap.get(cls)
cls = cls[0].upper()+cls[1:]
15 years, 7 months