You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/12/11 11:16:11 UTC
[1/2] ignite git commit: IGNITE-1932 Fixed busy time calculations
after ignite.cluster().resetMetrics(). - Fixes #242.
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5 0ac39c976 -> c2916442d
IGNITE-1932 Fixed busy time calculations after ignite.cluster().resetMetrics(). - Fixes #242.
Signed-off-by: Alexey Kuznetsov <ak...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/69a6b0f9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/69a6b0f9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/69a6b0f9
Branch: refs/heads/ignite-1.5
Commit: 69a6b0f93b4ce55e9693620666cd016f527dd838
Parents: 0ac39c9
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Dec 11 17:11:38 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Dec 11 17:11:38 2015 +0700
----------------------------------------------------------------------
.../processors/jobmetrics/GridJobMetricsProcessor.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/69a6b0f9/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessor.java
index 06b9383..72ffe23 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessor.java
@@ -108,7 +108,13 @@ public class GridJobMetricsProcessor extends GridProcessorAdapter {
* Resets metrics.
*/
public void reset() {
+ InternalMetrics prevMetrics = metrics;
+
metrics = new InternalMetrics();
+
+ // Preserve totalIdleTime, because it is used for busy / idle time calculations.
+ if (prevMetrics != null)
+ metrics.totalIdleTime = prevMetrics.totalIdleTime;
}
/**
@@ -400,4 +406,4 @@ public class GridJobMetricsProcessor extends GridProcessorAdapter {
return m;
}
}
-}
\ No newline at end of file
+}
[2/2] ignite git commit: ignite-1.5 Minor fix in Schema Import Demo
README.txt
Posted by ak...@apache.org.
ignite-1.5 Minor fix in Schema Import Demo README.txt
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c2916442
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c2916442
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c2916442
Branch: refs/heads/ignite-1.5
Commit: c2916442dc334c4968aade070d936139ba13d807
Parents: 69a6b0f
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Dec 11 17:15:39 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Dec 11 17:15:39 2015 +0700
----------------------------------------------------------------------
examples/schema-import/README.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c2916442/examples/schema-import/README.txt
----------------------------------------------------------------------
diff --git a/examples/schema-import/README.txt b/examples/schema-import/README.txt
index c5aa2d5..ff2d517 100644
--- a/examples/schema-import/README.txt
+++ b/examples/schema-import/README.txt
@@ -25,7 +25,7 @@ Schema Import Utility Demo
3. Paste content of "examples/schema-import/bin/db-init.sql" into H2 Console and execute.
-4. Start Schema Import utility: "bin/ignite-schema-import.sh examples/schema-import/bin/schema-import.properties"
+4. Start Schema Import utility: "IGNITE_HOME/bin/ignite-schema-import.sh examples/schema-import/bin/schema-import.properties"
Schema Utility will start with predefined settings for this demo.
Click "Next", "Generate" and answer "Yes" to all override warnings.