~ubuntu-branches/ubuntu/natty/eucalyptus/natty-updates

« back to all changes in this revision

Viewing changes to clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusStatistics.java

Committer: Bazaar Package Importer
Author(s): Dustin Kirkland
Date: 2009-12-17 18:22:02 UTC
mto: This revision was merged to the branch mainline in revision 83.
Revision ID: james.westby@ubuntu.com-20091217182202-0v2v09ry3cxrvh84

Tags: upstream-1.6.2~bzr1103

Import upstream version 1.6.2~bzr1103

files added:
clc/modules/configuration/conf/scripts

clc/modules/configuration/conf/scripts/describe_nodes.groovy

clc/modules/core/conf/scripts/Import_161.groovy

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/InvalidTargetBucketForLoggingException.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/AOEMetaInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/AOEVolumeInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ISCSIMetaInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ISCSIVolumeInfo.java

clc/modules/database

clc/modules/database/build.xml

clc/modules/database/conf

clc/modules/database/conf/scripts

clc/modules/database/conf/scripts/after_database.groovy

clc/modules/database/conf/scripts/before_database.groovy

clc/modules/database/conf/scripts/caches.groovy

clc/modules/database/conf/scripts/db

clc/modules/database/conf/scripts/entities.groovy

clc/modules/database/conf/scripts/pools.groovy

clc/modules/database/src

clc/modules/database/src/main

clc/modules/database/src/main/java

clc/modules/database/src/main/java/com

clc/modules/database/src/main/java/com/eucalyptus

clc/modules/database/src/main/java/com/eucalyptus/bootstrap

clc/modules/database/src/main/java/com/eucalyptus/bootstrap/DatabaseConfig.java

clc/modules/database/src/main/java/com/eucalyptus/bootstrap/LocalDatabaseBootstrapper.java

clc/modules/database/src/main/java/com/eucalyptus/util

clc/modules/database/src/main/java/com/eucalyptus/util/DatabaseUtil.java

clc/modules/database/src/main/java/com/eucalyptus/util/EntityWrapper.java

clc/modules/database/src/main/java/com/eucalyptus/util/TxHandle.java

clc/modules/database/src/main/resources

clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/cloud/BucketLogData.java

clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/storage/ISCSIManager.java

clc/modules/wsstack/conf/scripts

clc/modules/wsstack/conf/scripts/channels.groovy

clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/WalrusRESTLogger.java

clc/modules/wsstack/src/main/java/com/eucalyptus/ws/util/WalrusBucketLogger.java

tools/connect_iscsitarget.pl

tools/disconnect_iscsitarget.pl

tools/get_iscsitarget.pl

files removed:
clc/modules/authentication/src/main/resources/META-INF/persistence.xml

clc/modules/cloud/src/main/java/com/eucalyptus/bootstrap/DatabaseConfig.java

clc/modules/cloud/src/main/java/com/eucalyptus/bootstrap/LocalDatabaseBootstrapper.java

clc/modules/configuration/src/main/resources/META-INF/persistence.xml

clc/modules/core/src/main/resources/META-INF/persistence.xml

clc/modules/core/src/main/resources/c3p0-config.xml

clc/modules/dns/src/main/resources/META-INF/persistence.xml

clc/modules/image-manager/src/main/resources/META-INF/persistence.xml

clc/modules/msgs/src/main/java/com/eucalyptus/util/DatabaseUtil.java

clc/modules/msgs/src/main/java/com/eucalyptus/util/EntityWrapper.java

clc/modules/msgs/src/main/java/com/eucalyptus/util/TxHandle.java

clc/modules/storage-controller/src/main/resources/META-INF/persistence.xml

clc/modules/walrus/src/main/resources/META-INF/persistence.xml

files modified:
CHANGELOG

VERSION

clc/.classpath

clc/.project

clc/build.xml

clc/modules/authentication/src/main/java/com/eucalyptus/auth/CredentialEntities.groovy

clc/modules/bootstrap/Makefile

clc/modules/bootstrap/arguments.ggo

clc/modules/bootstrap/eucalyptus-bootstrap.c

clc/modules/bootstrap/eucalyptus-bootstrap.h

clc/modules/bootstrap/eucalyptus-opts.c

clc/modules/bootstrap/eucalyptus-opts.h

clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/ClusterEndpoint.java

clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/VmInstance.java

clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/VmTypes.java

clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/ws/SystemState.java

clc/modules/configuration/src/main/java/com/eucalyptus/config/Configuration.java

clc/modules/configuration/src/main/java/com/eucalyptus/config/ConfigurationEntities.groovy

clc/modules/core/src/main/java/com/eucalyptus/util/DNSProperties.java

clc/modules/core/src/main/java/com/eucalyptus/util/StorageProperties.java

clc/modules/core/src/main/java/com/eucalyptus/util/WalrusProperties.java

clc/modules/core/src/main/java/com/eucalyptus/util/WalrusUtil.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/AccessDeniedException.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/BucketNotEmptyException.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/EntityTooLargeException.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/NoSuchEntityException.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/WalrusException.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ARecordInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/Address.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/BucketInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/CNAMERecordInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ClusterInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/Counters.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/GrantInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ImageCacheInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ImageInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/LVMMetaInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/LVMVolumeInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/MetaDataInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/NSRecordInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ObjectInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ProductCode.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/SOARecordInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/SnapshotInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/StorageInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/StorageStatsInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/SystemConfiguration.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/TorrentInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/UserGroupInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/UserInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/VmType.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/VolumeInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/WalrusInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/WalrusSnapshotInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/WalrusStatsInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/ZoneInfo.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/state/AbstractIsomorph.java

clc/modules/core/src/main/java/edu/ucsb/eucalyptus/util/WalrusDataMessage.java

clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/DNSControl.java

clc/modules/dns/src/main/java/com/eucalyptus/dns/TransientZone.java

clc/modules/image-manager/src/main/java/edu/ucsb/eucalyptus/cloud/state/Snapshot.java

clc/modules/image-manager/src/main/java/edu/ucsb/eucalyptus/cloud/state/Volume.java

clc/modules/image-manager/src/main/java/edu/ucsb/eucalyptus/cloud/ws/VolumeManager.java

clc/modules/module-inc.xml

clc/modules/msgs/conf/scripts/startup.groovy

clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/SystemBootstrapper.java

clc/modules/msgs/src/main/java/com/eucalyptus/entities/BaseEntities.groovy

clc/modules/msgs/src/main/java/com/eucalyptus/util/DebugUtil.java

clc/modules/msgs/src/main/java/com/eucalyptus/util/GroovyUtil.java

clc/modules/msgs/src/main/java/com/eucalyptus/util/LogUtil.groovy

clc/modules/msgs/src/main/java/com/eucalyptus/util/SubDirectory.java

clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/Configuration.groovy

clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/Messages.groovy

clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/Walrus.groovy

clc/modules/msgs/src/main/resources/s3-2006-03-01-binding.xml

clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/StorageManager.java

clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileSystemStorageManager.java

clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/BlockStorage.java

clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/StorageEventListener.java

clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/storage/AOEManager.java

clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/storage/LVM2Manager.java

clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/storage/LogicalStorageManager.java

clc/modules/storage-controller/src/main/java/edu/ucsb/eucalyptus/storage/StorageExportManager.java

clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusControl.java

clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusImageManager.java

clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusManager.java

clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusStatistics.java

clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/ObjectTest.java

clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/HeartbeatHandler.java

clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/WalrusAuthenticationHandler.java

clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/WalrusRESTBinding.java

clc/modules/wsstack/src/main/java/com/eucalyptus/ws/stages/WalrusRESTBindingStage.java

clc/modules/wsstack/src/main/java/com/eucalyptus/ws/util/ChannelUtil.java

cluster/cc-client-marshal-adb.c

cluster/handlers.c

cluster/handlers.h

net/vnetwork.h

node/handlers.c

node/handlers.h

node/handlers_kvm.c

node/handlers_xen.c

storage/storage.c

tools/Makefile

tools/euca_conf.in

tools/eucalyptus-cc.in

tools/eucalyptus-cloud.in

tools/eucalyptus.conf

tools/partition2disk

util/data.h

util/eucalyptus.h

util/ipc.c

util/ipc.h

util/test.c

Show diffs side-by-side

added added

removed removed

clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusStatistics.java

126

}

127

128

private void getStateInfo() {

129

EntityWrapper<WalrusStatsInfo> db = new EntityWrapper<WalrusStatsInfo>();

129

EntityWrapper<WalrusStatsInfo> db = new EntityWrapper<WalrusStatsInfo>("eucalyptus_walrus");

130

try {

131

WalrusStatsInfo walrusStats = db.getUnique(new WalrusStatsInfo(WalrusProperties.NAME));

132

numberOfBuckets = walrusStats.getNumberOfBuckets();

141

}

142

143

private void updateStateInfo() {

144

EntityWrapper<WalrusStatsInfo> db = new EntityWrapper<WalrusStatsInfo>();

144

EntityWrapper<WalrusStatsInfo> db = new EntityWrapper<WalrusStatsInfo>("eucalyptus_walrus");

145

try {

146

WalrusStatsInfo walrusStats = db.getUnique(new WalrusStatsInfo(WalrusProperties.NAME));

147

walrusStats.setNumberOfBuckets(numberOfBuckets);

Older »