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

bug 11423: get storage pool stats from "df --total" instead from libvirt 

status 11423: resolved fixed
This commit is contained in:
Edison Su 2011-09-13 18:46:43 -07:00
parent 29b5945263
commit cd4e076212
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
View File

@ -1419,12 +1419,30 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
protected GetStorageStatsAnswer execute(final GetStorageStatsCommand cmd) {
StoragePool sp = null;
StoragePoolInfo spi = null;
try {
Connect conn = LibvirtConnection.getConnection();
sp = _storageResource.getStoragePool(conn, cmd.getStorageId());
spi = sp.getInfo();
return new GetStorageStatsAnswer(cmd, spi.capacity, spi.allocation);
LibvirtStoragePoolDef spd = _storageResource.getStoragePoolDef(conn, sp);
String mountPoint = spd.getTargetPath();
Script statsScript = new Script("/bin/bash", s_logger);
statsScript.add("-c");
statsScript.add("stats=$(df --total " + mountPoint + " |grep total|awk '{print $2,$3}');echo $stats");
final OutputInterpreter.OneLineParser statsParser = new OutputInterpreter.OneLineParser();
String result = statsScript.execute(statsParser);
if (result != null) {
return new GetStorageStatsAnswer(cmd, result);
}
String stats = statsParser.getLine();
if (stats != null && !stats.isEmpty()) {
String sizes[] = stats.trim().split(" ");
if (sizes.length != 2) {
return new GetStorageStatsAnswer(cmd, "Failed to parse the result: " + stats);
}
return new GetStorageStatsAnswer(cmd, Long.parseLong(sizes[0]) * 1024, Long.parseLong(sizes[1]) * 1024);
} else {
return new GetStorageStatsAnswer(cmd, "Failed to parse result from df");
}
} catch (LibvirtException e) {
return new GetStorageStatsAnswer(cmd, e.toString());
}