lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jan...@apache.org
Subject lucene-solr:branch_6x: SOLR-10763: Admin UI replication tab sometimes empty when failed replications
Date Fri, 23 Jun 2017 13:20:41 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6x d9d3369cd -> 2ad8a6afd


SOLR-10763: Admin UI replication tab sometimes empty when failed replications

(cherry picked from commit 69d0c70)


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2ad8a6af
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2ad8a6af
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2ad8a6af

Branch: refs/heads/branch_6x
Commit: 2ad8a6afda7f609bd19463cb51ae6788094d516d
Parents: d9d3369
Author: Jan Høydahl <janhoy@apache.org>
Authored: Fri Jun 23 08:26:34 2017 +0200
Committer: Jan Høydahl <janhoy@apache.org>
Committed: Fri Jun 23 08:40:41 2017 +0200

----------------------------------------------------------------------
 solr/CHANGES.txt                                      | 2 ++
 solr/webapp/web/js/angular/controllers/replication.js | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2ad8a6af/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 4f94710..2403042 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -133,6 +133,8 @@ Bug Fixes
 
 * SOLR-10832: Fixed VersionInfo.getMaxVersionFromIndex when using PointsField with indexed="true"
(hossman)
 
+* SOLR-10763: Admin UI replication tab sometimes empty when failed replications (janhoy,
Bojan Vitnik)
+
 Optimizations
 ----------------------
 * SOLR-10634: JSON Facet API: When a field/terms facet will retrieve all buckets (i.e. limit:-1)

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2ad8a6af/solr/webapp/web/js/angular/controllers/replication.js
----------------------------------------------------------------------
diff --git a/solr/webapp/web/js/angular/controllers/replication.js b/solr/webapp/web/js/angular/controllers/replication.js
index 830825d..9f7ac3e 100644
--- a/solr/webapp/web/js/angular/controllers/replication.js
+++ b/solr/webapp/web/js/angular/controllers/replication.js
@@ -105,13 +105,13 @@ var getIterations = function(slave) {
     for (var i in slave.replicationFailedAtList) {
         var failedDate = slave.replicationFailedAtList[i];
         var matchingIterations = find(iterations, failedDate);
-        if (matchingIterations) {
+        if (matchingIterations[0]) {
             iteration = matchingIterations[0];
+            iteration.status = "failed";
         } else {
-            iteration = {date: failedDate, latest:false};
+            iteration = {date: failedDate, status:"failed", latest:false};
             iterations.push(iteration);
         }
-        iteration.status = "failed";
         if (failedDate == slave.replicationFailedAt) {
             iteration.latest = true;
         }


Mime
View raw message