From eba2bd51c19fe4dc765a5a543f2e78b549e77d1b Mon Sep 17 00:00:00 2001
From: Adrien Grand <jpountz@gmail.com>
Date: Tue, 2 Dec 2014 17:26:34 +0100
Subject: [PATCH] Core: Upgrade to lucene-5.0.0-snapshot-1642891.

The only required change was to add a description to our index outputs.

Close #8743
---
 pom.xml                                                       | 4 ++--
 .../gateway/local/state/meta/MetaDataStateFormat.java         | 3 ++-
 .../org/elasticsearch/index/store/VerifyingIndexOutput.java   | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index cd2b3148ee7..b922a8ee7c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <lucene.version>5.0.0</lucene.version>
-        <lucene.maven.version>5.0.0-snapshot-1641343</lucene.maven.version>
+        <lucene.maven.version>5.0.0-snapshot-1642891</lucene.maven.version>
         <tests.jvms>auto</tests.jvms>
         <tests.shuffle>true</tests.shuffle>
         <tests.output>onerror</tests.output>
@@ -54,7 +54,7 @@
         </repository>
         <repository>
             <id>Lucene snapshots</id>
-            <url>https://download.elasticsearch.org/lucenesnapshots/1641343</url> 
+            <url>https://download.elasticsearch.org/lucenesnapshots/1642891</url>
         </repository>
     </repositories>
 
diff --git a/src/main/java/org/elasticsearch/gateway/local/state/meta/MetaDataStateFormat.java b/src/main/java/org/elasticsearch/gateway/local/state/meta/MetaDataStateFormat.java
index 8de74a3f6e8..89e4b057089 100644
--- a/src/main/java/org/elasticsearch/gateway/local/state/meta/MetaDataStateFormat.java
+++ b/src/main/java/org/elasticsearch/gateway/local/state/meta/MetaDataStateFormat.java
@@ -98,7 +98,8 @@ public abstract class MetaDataStateFormat<T> {
         final Path tmpStatePath = stateLocation.resolve(fileName + ".tmp");
         final Path finalStatePath = stateLocation.resolve(fileName);
         try {
-            try (OutputStreamIndexOutput out = new OutputStreamIndexOutput(Files.newOutputStream(tmpStatePath), BUFFER_SIZE)) {
+            final String resourceDesc = "MetaDataStateFormat.write(path=\"" + tmpStatePath + "\")";
+            try (OutputStreamIndexOutput out = new OutputStreamIndexOutput(resourceDesc, Files.newOutputStream(tmpStatePath), BUFFER_SIZE)) {
                 CodecUtil.writeHeader(out, STATE_FILE_CODEC, STATE_FILE_VERSION);
                 out.writeInt(format.index());
                 out.writeLong(version);
diff --git a/src/main/java/org/elasticsearch/index/store/VerifyingIndexOutput.java b/src/main/java/org/elasticsearch/index/store/VerifyingIndexOutput.java
index 90ae940d0b4..53446281074 100644
--- a/src/main/java/org/elasticsearch/index/store/VerifyingIndexOutput.java
+++ b/src/main/java/org/elasticsearch/index/store/VerifyingIndexOutput.java
@@ -33,6 +33,7 @@ public abstract class VerifyingIndexOutput extends IndexOutput {
     
     /** Sole constructor */
     VerifyingIndexOutput(IndexOutput out) {
+        super("VerifyingIndexOutput(in=" + out + ")");
         this.out = out;
     }