etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 10580: Making necessary changes to stats collection to entertain multiple secondary storage. 

status 10580: resolved fixed
This commit is contained in:
Nitin 2011-07-06 18:10:25 +05:30
parent 2aa1f3e596
commit fb981be800
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api/src/com/cloud/agent/api/GetStorageStatsCommand.java
View File

@ -25,9 +25,18 @@ public class GetStorageStatsCommand extends Command {
private String id;
private String localPath;
private StoragePoolType pooltype;
private String secUrl;
public GetStorageStatsCommand() {
public String getSecUrl() {
return secUrl;
}
public void setSecUrl(String secUrl) {
this.secUrl = secUrl;
}
public GetStorageStatsCommand() {
}
public StoragePoolType getPooltype() {
@ -38,8 +47,8 @@ public class GetStorageStatsCommand extends Command {
this.pooltype = pooltype;
}
public GetStorageStatsCommand(String id) {
this.id = id;
public GetStorageStatsCommand(String secUrl) {
this.secUrl = secUrl;
}
public GetStorageStatsCommand(String id, StoragePoolType pooltype) {

2
core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
View File

@ -305,7 +305,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
}
protected GetStorageStatsAnswer execute(final GetStorageStatsCommand cmd) {
String rootDir = getRootDir(cmd.getLocalPath());
String rootDir = getRootDir(cmd.getSecUrl());
final long usedSize = getUsedSize(rootDir);
final long totalSize = getTotalSize(rootDir);
if (usedSize == -1 || totalSize == -1) {

8
server/src/com/cloud/server/StatsCollector.java
View File

@ -258,15 +258,19 @@ public class StatsCollector {
class StorageCollector implements Runnable {
@Override
public void run() {
try {
try {
s_logger.debug("StorageCollector is running...");
List<HostVO> hosts = _hostDao.listSecondaryStorageHosts();
ConcurrentHashMap<Long, StorageStats> storageStats = new ConcurrentHashMap<Long, StorageStats>();
for (HostVO host : hosts) {
GetStorageStatsCommand command = new GetStorageStatsCommand(host.getStorageUrl());
HostVO ssAhost = _agentMgr.getSSAgent(host);
long hostId = host.getId();
Answer answer = _agentMgr.easySend(hostId, command);
Answer answer = _agentMgr.easySend(ssAhost.getId(), command);
if (answer != null && answer.getResult()) {
storageStats.put(hostId, (StorageStats)answer);
s_logger.debug("HostId: "+hostId+ " Used: " + ((StorageStats)answer).getByteUsed() + " Total Available: " + ((StorageStats)answer).getCapacityBytes());
//Seems like we have dynamically updated the sec. storage as prev. size and the current do not match
if (_storageStats.get(hostId)!=null &&
_storageStats.get(hostId).getCapacityBytes() != ((StorageStats)answer).getCapacityBytes()){