You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2018/06/28 14:11:20 UTC

[1/3] lucene-solr:master: SOLR-12418: contrib/prometheus-exporter (private) logger rename

Repository: lucene-solr
Updated Branches:
  refs/heads/master d2ac32368 -> ab666ff9c


SOLR-12418: contrib/prometheus-exporter (private) logger rename


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

Branch: refs/heads/master
Commit: f459bf4397c4201b3ddd47a9f00bbcc877351d5c
Parents: d2ac323
Author: Christine Poerschke <cp...@apache.org>
Authored: Thu Jun 28 14:44:18 2018 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Thu Jun 28 14:44:18 2018 +0100

----------------------------------------------------------------------
 .../prometheus/collector/SolrCollector.java     | 24 ++++++++++----------
 .../solr/prometheus/exporter/SolrExporter.java  |  6 ++---
 .../solr/prometheus/scraper/SolrScraper.java    | 10 ++++----
 3 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f459bf43/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/SolrCollector.java
----------------------------------------------------------------------
diff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/SolrCollector.java b/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/SolrCollector.java
index 66bae42..8a64b24 100644
--- a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/SolrCollector.java
+++ b/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/SolrCollector.java
@@ -54,7 +54,7 @@ import java.util.concurrent.TimeUnit;
  * SolrCollector
  */
 public class SolrCollector extends Collector implements Collector.Describable {
-  private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   private SolrClient solrClient;
   private Config config;
@@ -124,7 +124,7 @@ public class SolrCollector extends Collector implements Collector.Describable {
                       futureList.add(future);
                     }
                   } catch (SolrServerException | IOException e) {
-                    this.logger.error("failed to get cores: " + e.getMessage());
+                    this.log.error("failed to get cores: " + e.getMessage());
                   }
                 } else if (coreName != null && collectionName == null) {
                   LinkedHashMap conf = (LinkedHashMap) requestNL.asMap(10);
@@ -141,17 +141,17 @@ public class SolrCollector extends Collector implements Collector.Describable {
                 Map<String, MetricFamilySamples> m = future.get(60, TimeUnit.SECONDS);
                 mergeMetrics(metricFamilySamplesMap, m);
               } catch (InterruptedException | ExecutionException | TimeoutException e) {
-                this.logger.error(e.getMessage());
+                this.log.error(e.getMessage());
               }
             }
           } catch (SolrServerException | IOException e) {
-            this.logger.error("failed to get HttpSolrClients: " + e.getMessage());
+            this.log.error("failed to get HttpSolrClients: " + e.getMessage());
           } finally {
             for (HttpSolrClient httpSolrClient : httpSolrClients) {
               try {
                 httpSolrClient.close();
               } catch (IOException e) {
-                this.logger.error("failed to close HttpSolrClient: " + e.getMessage());
+                this.log.error("failed to close HttpSolrClient: " + e.getMessage());
               }
             }
           }
@@ -175,7 +175,7 @@ public class SolrCollector extends Collector implements Collector.Describable {
                   futureList.add(future);
                 }
               } catch (SolrServerException | IOException e) {
-                this.logger.error("failed to get cores: " + e.getMessage());
+                this.log.error("failed to get cores: " + e.getMessage());
               }
             } else if (coreName == null && collectionName != null) {
               LinkedHashMap conf = (LinkedHashMap) requestNL.asMap(10);
@@ -204,7 +204,7 @@ public class SolrCollector extends Collector implements Collector.Describable {
                   futureList.add(future);
                 }
               } catch (SolrServerException | IOException e) {
-                this.logger.error("failed to get cores: " + e.getMessage());
+                this.log.error("failed to get cores: " + e.getMessage());
               }
             } else {
               LinkedHashMap conf = (LinkedHashMap) requestNL.asMap(10);
@@ -244,17 +244,17 @@ public class SolrCollector extends Collector implements Collector.Describable {
                 Map<String, MetricFamilySamples> m = future.get(60, TimeUnit.SECONDS);
                 mergeMetrics(metricFamilySamplesMap, m);
               } catch (InterruptedException | ExecutionException | TimeoutException e) {
-                this.logger.error(e.getMessage());
+                this.log.error(e.getMessage());
               }
             }
           } catch (SolrServerException | IOException e) {
-            this.logger.error(e.getMessage());
+            this.log.error(e.getMessage());
           } finally {
             for (HttpSolrClient httpSolrClient : httpSolrClients) {
               try {
                 httpSolrClient.close();
               } catch (IOException e) {
-                this.logger.error(e.getMessage());
+                this.log.error(e.getMessage());
               }
             }
           }
@@ -306,11 +306,11 @@ public class SolrCollector extends Collector implements Collector.Describable {
           Map<String, MetricFamilySamples> m = future.get(60, TimeUnit.SECONDS);
           mergeMetrics(metricFamilySamplesMap, m);
         } catch (InterruptedException | ExecutionException | TimeoutException e) {
-          this.logger.error(e.getMessage());
+          this.log.error(e.getMessage());
         }
       }
     } catch (Exception e) {
-      this.logger.error(e.getMessage());
+      this.log.error(e.getMessage());
       e.printStackTrace();
     }
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f459bf43/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.java
----------------------------------------------------------------------
diff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.java b/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.java
index 01ebd74..6eae66c 100644
--- a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.java
+++ b/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.java
@@ -50,7 +50,7 @@ import java.util.regex.Pattern;
  * SolrExporter
  */
 public class SolrExporter {
-  private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   private static final String[] ARG_PORT_FLAGS = { "-p", "--port" };
   private static final String ARG_PORT_METAVAR = "PORT";
@@ -243,9 +243,9 @@ public class SolrExporter {
 
       SolrExporter solrExporter = new SolrExporter(port, connStr, configPath, numThreads);
       solrExporter.start();
-      logger.info("Start server");
+      log.info("Start server");
     } catch (ParserConfigurationException | SAXException | IOException e) {
-      logger.error("Start server failed: " + e.toString());
+      log.error("Start server failed: " + e.toString());
     } catch (ArgumentParserException e) {
       parser.handleError(e);
     }

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f459bf43/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrScraper.java
----------------------------------------------------------------------
diff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrScraper.java b/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrScraper.java
index dd74384..9d1f17e 100644
--- a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrScraper.java
+++ b/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrScraper.java
@@ -45,7 +45,7 @@ import java.util.concurrent.Callable;
  * SolrScraper
  */
 public class SolrScraper implements Callable<Map<String, Collector.MetricFamilySamples>> {
-  private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   private SolrClient solrClient;
   private LinkedHashMap conf;
@@ -113,7 +113,7 @@ public class SolrScraper implements Callable<Map<String, Collector.MetricFamilyS
           queryResponse = solrClient.request(queryRequest, collection);
         }
       } catch (SolrServerException | IOException e) {
-        this.logger.error("failed to request: " + queryRequest.getPath() + " " + e.getMessage());
+        this.log.error("failed to request: " + queryRequest.getPath() + " " + e.getMessage());
       }
 
       ObjectMapper om = new ObjectMapper();
@@ -198,14 +198,14 @@ public class SolrScraper implements Callable<Map<String, Collector.MetricFamilyS
             }
           }
         } catch (JsonQueryException e) {
-          this.logger.error(e.toString() + " " + q.toString());
+          this.log.error(e.toString() + " " + q.toString());
           SolrExporter.scrapeErrorTotal.inc();
         }
       }
     } catch (HttpSolrClient.RemoteSolrException | IOException e) {
-      this.logger.error("failed to request: " + e.toString());
+      this.log.error("failed to request: " + e.toString());
     } catch (Exception e) {
-      this.logger.error(e.toString());
+      this.log.error(e.toString());
       e.printStackTrace();
     }
 


[2/3] lucene-solr:master: SOLR-12419: standardise solr/contrib (private) logger names

Posted by cp...@apache.org.
SOLR-12419: standardise solr/contrib (private) logger names


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

Branch: refs/heads/master
Commit: e1d2749b20a3b04beef08ab75a2c6deb4f2cdf41
Parents: f459bf4
Author: Christine Poerschke <cp...@apache.org>
Authored: Thu Jun 28 14:47:33 2018 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Thu Jun 28 14:47:33 2018 +0100

----------------------------------------------------------------------
 lucene/tools/src/groovy/check-source-patterns.groovy | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e1d2749b/lucene/tools/src/groovy/check-source-patterns.groovy
----------------------------------------------------------------------
diff --git a/lucene/tools/src/groovy/check-source-patterns.groovy b/lucene/tools/src/groovy/check-source-patterns.groovy
index f0007f5..63541c2 100644
--- a/lucene/tools/src/groovy/check-source-patterns.groovy
+++ b/lucene/tools/src/groovy/check-source-patterns.groovy
@@ -66,6 +66,7 @@ def lineSplitter = ~$/[\r\n]+/$;
 def singleLineSplitter = ~$/\n\r?/$;
 def licenseMatcher = Defaults.createDefaultMatcher();
 def validLoggerPattern = ~$/(?s)\b(private\s|static\s|final\s){3}+\s*Logger\s+\p{javaJavaIdentifierStart}+\s+=\s+\QLoggerFactory.getLogger(MethodHandles.lookup().lookupClass());\E/$;
+def validLoggerNamePattern = ~$/(?s)\b(private\s|static\s|final\s){3}+\s*Logger\s+(log|LOG)+\s+=\s+\QLoggerFactory.getLogger(MethodHandles.lookup().lookupClass());\E/$;
 def packagePattern = ~$/(?m)^\s*package\s+org\.apache.*;/$;
 def xmlTagPattern = ~$/(?m)\s*<[a-zA-Z].*/$;
 def sourceHeaderPattern = ~$/\[source\b.*/$;
@@ -169,6 +170,9 @@ ant.fileScanner{
       if (!validLoggerPattern.matcher(text).find()) {
         reportViolation(f, 'invalid logging pattern [not private static final, uses static class name]');
       }
+      if (f.toString().contains('solr/contrib') && !validLoggerNamePattern.matcher(text).find()) {
+        reportViolation(f, 'invalid logger name [not log or LOG]');
+      }
     }
     checkLicenseHeaderPrecedes(f, 'package', packagePattern, javaCommentPattern, text, ratDocument);
     if (f.name.contains("Test")) {


[3/3] lucene-solr:master: SOLR-12524: mention ids in CdcrLogReader.forwardSeek's assert

Posted by cp...@apache.org.
SOLR-12524: mention ids in CdcrLogReader.forwardSeek's assert


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

Branch: refs/heads/master
Commit: ab666ff9cfed0d816c58bf64ebf295f7f38f5cd1
Parents: e1d2749
Author: Christine Poerschke <cp...@apache.org>
Authored: Thu Jun 28 14:53:56 2018 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Thu Jun 28 14:53:56 2018 +0100

----------------------------------------------------------------------
 solr/core/src/java/org/apache/solr/update/CdcrUpdateLog.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ab666ff9/solr/core/src/java/org/apache/solr/update/CdcrUpdateLog.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/CdcrUpdateLog.java b/solr/core/src/java/org/apache/solr/update/CdcrUpdateLog.java
index bff1612..6d41b64 100644
--- a/solr/core/src/java/org/apache/solr/update/CdcrUpdateLog.java
+++ b/solr/core/src/java/org/apache/solr/update/CdcrUpdateLog.java
@@ -608,7 +608,7 @@ public class CdcrUpdateLog extends UpdateLog {
         tlogs.removeLast();
         currentTlog = tlogs.peekLast();
       }
-      assert this.tlogs.peekLast().id == subReader.tlogs.peekLast().id;
+      assert this.tlogs.peekLast().id == subReader.tlogs.peekLast().id : this.tlogs.peekLast().id+" != "+subReader.tlogs.peekLast().id;
       this.pointer.set(currentTlog.tlogFile);
       this.lastPositionInTLog = subReader.lastPositionInTLog;
       this.numRecordsReadInCurrentTlog = subReader.numRecordsReadInCurrentTlog;