You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/12/12 14:04:12 UTC
[1/5] git commit: updated refs/heads/master to bdaa60f
Repository: cloudstack
Updated Branches:
refs/heads/master 7fa62a576 -> bdaa60fd6
CLOUDSTACK-9113: skip vm with inconsistent state when getVmStats/getVmDiskStats
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/24edf1c1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/24edf1c1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/24edf1c1
Branch: refs/heads/master
Commit: 24edf1c1e4892b2f34b334b6e6fa13364bc413e2
Parents: 9ce1334
Author: Wei Zhou <w....@tech.leaseweb.com>
Authored: Mon Dec 7 12:02:43 2015 +0100
Committer: Wei Zhou <w....@tech.leaseweb.com>
Committed: Mon Dec 7 12:15:24 2015 +0100
----------------------------------------------------------------------
.../LibvirtGetVmDiskStatsCommandWrapper.java | 16 ++++++++++------
.../wrapper/LibvirtGetVmStatsCommandWrapper.java | 14 +++++++++-----
2 files changed, 19 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/24edf1c1/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmDiskStatsCommandWrapper.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmDiskStatsCommandWrapper.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmDiskStatsCommandWrapper.java
index 52449e9..6316be9 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmDiskStatsCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmDiskStatsCommandWrapper.java
@@ -48,12 +48,16 @@ public final class LibvirtGetVmDiskStatsCommandWrapper extends CommandWrapper<Ge
final HashMap<String, List<VmDiskStatsEntry>> vmDiskStatsNameMap = new HashMap<String, List<VmDiskStatsEntry>>();
final Connect conn = libvirtUtilitiesHelper.getConnection();
for (final String vmName : vmNames) {
- final List<VmDiskStatsEntry> statEntry = libvirtComputingResource.getVmDiskStat(conn, vmName);
- if (statEntry == null) {
- continue;
- }
+ try {
+ final List<VmDiskStatsEntry> statEntry = libvirtComputingResource.getVmDiskStat(conn, vmName);
+ if (statEntry == null) {
+ continue;
+ }
- vmDiskStatsNameMap.put(vmName, statEntry);
+ vmDiskStatsNameMap.put(vmName, statEntry);
+ } catch (LibvirtException e) {
+ s_logger.warn("Can't get vm disk stats: " + e.toString() + ", continue");
+ }
}
return new GetVmDiskStatsAnswer(command, "", command.getHostName(), vmDiskStatsNameMap);
} catch (final LibvirtException e) {
@@ -61,4 +65,4 @@ public final class LibvirtGetVmDiskStatsCommandWrapper extends CommandWrapper<Ge
return new GetVmDiskStatsAnswer(command, null, null, null);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/24edf1c1/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmStatsCommandWrapper.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmStatsCommandWrapper.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmStatsCommandWrapper.java
index 6a71d2f..e19d868 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmStatsCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmStatsCommandWrapper.java
@@ -49,12 +49,16 @@ public final class LibvirtGetVmStatsCommandWrapper extends CommandWrapper<GetVmS
final LibvirtUtilitiesHelper libvirtUtilitiesHelper = libvirtComputingResource.getLibvirtUtilitiesHelper();
final Connect conn = libvirtUtilitiesHelper.getConnectionByVmName(vmName);
- final VmStatsEntry statEntry = libvirtComputingResource.getVmStat(conn, vmName);
- if (statEntry == null) {
- continue;
- }
+ try {
+ final VmStatsEntry statEntry = libvirtComputingResource.getVmStat(conn, vmName);
+ if (statEntry == null) {
+ continue;
+ }
- vmStatsNameMap.put(vmName, statEntry);
+ vmStatsNameMap.put(vmName, statEntry);
+ } catch (LibvirtException e) {
+ s_logger.warn("Can't get vm stats: " + e.toString() + ", continue");
+ }
}
return new GetVmStatsAnswer(command, vmStatsNameMap);
} catch (final LibvirtException e) {
[2/5] git commit: updated refs/heads/master to bdaa60f
Posted by re...@apache.org.
Show actual diff in commits after merge
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/52edbbb6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/52edbbb6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/52edbbb6
Branch: refs/heads/master
Commit: 52edbbb6cc2e2c58e360b737143c10adddc43880
Parents: 3515f57
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sat Dec 12 11:00:41 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sat Dec 12 11:22:32 2015 +0100
----------------------------------------------------------------------
tools/git/git-fwd-merge | 5 +++++
tools/git/git-pr | 3 +++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/52edbbb6/tools/git/git-fwd-merge
----------------------------------------------------------------------
diff --git a/tools/git/git-fwd-merge b/tools/git/git-fwd-merge
index d0ce46a..44cbf0a 100755
--- a/tools/git/git-fwd-merge
+++ b/tools/git/git-fwd-merge
@@ -52,5 +52,10 @@ fi
# Clean up
rm -fr ${tmpMessageFile}
+apache_remote=$(git remote -v | grep -E "git-wip-us\.apache\.org" | head -n 1 | cut -f1)
+echo "INFO: Actual diff in commits is: (running git log --pretty=oneline --abbrev-commit ${apache_remote}/${currentBranch}..${currentBranch})"
+echo
+git log --pretty=oneline --abbrev-commit ${apache_remote}/${currentBranch}..${currentBranch}
+
# What's next
echo "We're done! Please double check using 'git log -p' and 'git push' when you're sure."
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/52edbbb6/tools/git/git-pr
----------------------------------------------------------------------
diff --git a/tools/git/git-pr b/tools/git/git-pr
index 2bd58f6..696e0ad 100755
--- a/tools/git/git-pr
+++ b/tools/git/git-pr
@@ -179,6 +179,7 @@ elif [ "${prMergeableState}" != "clean" ] && [ ${force} -eq 1 ]; then
fi
github_remote=$(git remote -v | grep -E "apache/${repoName}(.git)?" | head -n 1 | cut -f1)
+apache_remote=$(git remote -v | grep -E "git-wip-us\.apache\.org" | head -n 1 | cut -f1)
if [ ${#github_remote} -eq 0 ]; then
echo "ERROR: We couldn't find a git remote pointing to 'apache/${repoName}.git' to merge the PR from."
echo "INFO: Currently, your configured remotes are:"
@@ -230,6 +231,8 @@ fi
echo "INFO: ***********************************************************************************"
echo "INFO: Merged successfully! Please double check using 'git log -p' and 'git push' when you're sure."
echo "INFO: About commits: there should be ${prCommits} from the PR plus 1 merge commit."
+echo "INFO: Actual diff in commits is: (running git log --pretty=oneline --abbrev-commit ${apache_remote}/${currentBranch}..${currentBranch})"
echo
+git log --pretty=oneline --abbrev-commit ${apache_remote}/${currentBranch}..${currentBranch}
clean_up_and_exit 0
[5/5] git commit: updated refs/heads/master to bdaa60f
Posted by re...@apache.org.
Merge release branch 4.6 to master
* 4.6:
Show actual diff in commits after merge
CLOUDSTACK-9113: skip vm with inconsistent state when getVmStats/getVmDiskStats
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bdaa60fd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bdaa60fd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bdaa60fd
Branch: refs/heads/master
Commit: bdaa60fd6c04f0e8d08bf889a11702eb6017ad53
Parents: 7fa62a5 65bf2ed
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sat Dec 12 14:03:43 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sat Dec 12 14:03:43 2015 +0100
----------------------------------------------------------------------
.../LibvirtGetVmDiskStatsCommandWrapper.java | 16 ++++++++++------
.../wrapper/LibvirtGetVmStatsCommandWrapper.java | 14 +++++++++-----
tools/git/git-fwd-merge | 5 +++++
tools/git/git-pr | 3 +++
4 files changed, 27 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
[3/5] git commit: updated refs/heads/master to bdaa60f
Posted by re...@apache.org.
Merge pull request #1227 from remibergsma/git-pr-show-commits
Show actual diff in commits after merge with git-pr / git-fwd-mergeThis shows the diff in commits after using `git-pr` and `git-fwd-merge` tools, like this:
```
44e8c92 Merge pull request #1226 from borisroman/CLOUDSTACK-9148
0554610 Removed .pydevproject from plugin kvm hypervisor.
```
That helps in quickly seeing what change is applied and whether it makes sense. It doesn't touch the actual code base. I'm using this patch for some time already.
* pr/1227:
Show actual diff in commits after merge
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/61ebb53e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/61ebb53e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/61ebb53e
Branch: refs/heads/master
Commit: 61ebb53e17f225fc17b9011332cd9ae344db4350
Parents: b14dfca 52edbbb
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sat Dec 12 13:55:20 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sat Dec 12 13:55:20 2015 +0100
----------------------------------------------------------------------
tools/git/git-fwd-merge | 5 +++++
tools/git/git-pr | 3 +++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
[4/5] git commit: updated refs/heads/master to bdaa60f
Posted by re...@apache.org.
Merge pull request #1182 from ustcweizhou/CLOUDSTACK-9113-getVmStats
[4.6] CLOUDSTACK-9113: skip vm with inconsistent state when getVmStats/getVmDiskStatson KVM, if there is a vm has inconsistent state between hypervisor and db, the getVmStat will terminate and return null, all vm stats will not be updated.
we should skip the vm which has inconsistent state, and continue on others.
* pr/1182:
CLOUDSTACK-9113: skip vm with inconsistent state when getVmStats/getVmDiskStats
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/65bf2edf
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/65bf2edf
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/65bf2edf
Branch: refs/heads/master
Commit: 65bf2edfa196601d68e82f09012a393ee73499a2
Parents: 61ebb53 24edf1c
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sat Dec 12 13:58:48 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sat Dec 12 13:58:49 2015 +0100
----------------------------------------------------------------------
.../LibvirtGetVmDiskStatsCommandWrapper.java | 16 ++++++++++------
.../wrapper/LibvirtGetVmStatsCommandWrapper.java | 14 +++++++++-----
2 files changed, 19 insertions(+), 11 deletions(-)
----------------------------------------------------------------------