You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drat.apache.org by ma...@apache.org on 2018/08/13 23:29:47 UTC
[drat] branch gsoc18 updated (cbb9861 -> b07387f)
This is an automated email from the ASF dual-hosted git repository.
mattmann pushed a change to branch gsoc18
in repository https://gitbox.apache.org/repos/asf/drat.git.
from cbb9861 Revert to 1.2.3-SNAPSHOT built locally since it is compat with Java8.
add 43560b0 Fix for indexprogress bar allways 100
new da8746e Merge branch 'gsoc-2018' of https://github.com/ahmedifhaam/drat into gsoc18
new b07387f Don't wipe Solr stats core, or else we can't aggregate.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
distribution/src/main/resources/bin/drat | 2 --
proteus/src/main/java/backend/ProcessDratWrapper.java | 2 +-
.../src/main/webapp/resources/src/components/statisticscomp.vue | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
[drat] 02/02: Don't wipe Solr stats core,
or else we can't aggregate.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mattmann pushed a commit to branch gsoc18
in repository https://gitbox.apache.org/repos/asf/drat.git
commit b07387f28ce5c17bda0653f8e34324a59a4de087
Author: Chris Mattmann <ch...@jpl.nasa.gov>
AuthorDate: Mon Aug 13 16:29:33 2018 -0700
Don't wipe Solr stats core, or else we can't aggregate.
---
distribution/src/main/resources/bin/drat | 2 --
proteus/src/main/java/backend/ProcessDratWrapper.java | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/distribution/src/main/resources/bin/drat b/distribution/src/main/resources/bin/drat
index e011c83..b3fe9d4 100755
--- a/distribution/src/main/resources/bin/drat
+++ b/distribution/src/main/resources/bin/drat
@@ -224,8 +224,6 @@ function reset {
rm -rf $DRAT_HOME/filemgr/catalog
echo "rm -rf $DRAT_HOME/solr/drat/data"
rm -rf $DRAT_HOME/solr/drat/data
- echo "rm -rf $DRAT_HOME/solr/statistics/data"
- rm -rf $DRAT_HOME/solr/statistics/data
echo "rm -rf $DRAT_HOME/data/archive/*"
rm -rf $DRAT_HOME/data/archive/*
echo "rm -rf $DRAT_HOME/data/jobs/*"
diff --git a/proteus/src/main/java/backend/ProcessDratWrapper.java b/proteus/src/main/java/backend/ProcessDratWrapper.java
index 90695a8..18af717 100644
--- a/proteus/src/main/java/backend/ProcessDratWrapper.java
+++ b/proteus/src/main/java/backend/ProcessDratWrapper.java
@@ -249,7 +249,7 @@ public class ProcessDratWrapper extends GenericProcess
String wmUrl = PathUtils.replaceEnvVariables("[WORKFLOW_URL]");
this.wipeInstanceRepo(wmUrl);
- String[] coreNames = {"drat", "statistics"};
+ String[] coreNames = {"drat"}; // don't wipe stats or we can't aggregate data.
for(String coreName: coreNames){
resetLog.logInfo("DRAT: reset: wiping Solr core: [" + coreName + "]");
this.wipeSolrCore(coreName);
[drat] 01/02: Merge branch 'gsoc-2018' of
https://github.com/ahmedifhaam/drat into gsoc18
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mattmann pushed a commit to branch gsoc18
in repository https://gitbox.apache.org/repos/asf/drat.git
commit da8746eaf3bbde9df27e74da66aee075656a0fba
Merge: cbb9861 43560b0
Author: Chris Mattmann <ch...@jpl.nasa.gov>
AuthorDate: Mon Aug 13 13:57:10 2018 -0700
Merge branch 'gsoc-2018' of https://github.com/ahmedifhaam/drat into gsoc18
.../src/main/webapp/resources/src/components/statisticscomp.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)