honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10376 from dakrone/misc-addl-logging 

Miscellaneous additional logging and cleanups
This commit is contained in:
Simon Willnauer 2015-04-02 12:19:52 +02:00
parent 4d4dcef857 9ff217d89b
commit d30d3b967e
6 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java
View File

@ -108,4 +108,10 @@ public class FlushRequest extends BroadcastOperationRequest<FlushRequest> {
waitIfOngoing = in.readBoolean();
}
@Override
public String toString() {
return "FlushRequest{" +
"waitIfOngoing=" + waitIfOngoing +
", force=" + force + "}";
}
}

1
src/main/java/org/elasticsearch/index/engine/InternalEngine.java
View File

@ -147,6 +147,7 @@ public class InternalEngine extends Engine {
}
}
}
logger.trace("created new InternalEngine");
}
private SearcherManager createSearcherManager() throws EngineException {

1
src/main/java/org/elasticsearch/index/engine/ShadowEngine.java
View File

@ -90,6 +90,7 @@ public class ShadowEngine extends Engine {
} catch (IOException ex) {
throw new EngineCreationFailureException(shardId, "failed to open index reader", ex);
}
logger.trace("created new ShadowEngine");
}

2
src/main/java/org/elasticsearch/index/shard/IndexShard.java
View File

@ -561,7 +561,7 @@ public class IndexShard extends AbstractIndexShardComponent {
public void refresh(String source) throws ElasticsearchException {
verifyNotClosed();
if (logger.isTraceEnabled()) {
logger.trace("refresh with soruce: {}", source);
logger.trace("refresh with source: {}", source);
}
long time = System.nanoTime();
engine().refresh(source);

6
src/main/java/org/elasticsearch/indices/IndicesService.java
View File

@ -291,7 +291,11 @@ public class IndicesService extends AbstractLifecycleComponent<IndicesService> i
indicesLifecycle.beforeIndexCreated(index, settings);
logger.debug("creating Index [{}], shards [{}]/[{}]", sIndexName, settings.get(SETTING_NUMBER_OF_SHARDS), settings.get(SETTING_NUMBER_OF_REPLICAS));
logger.debug("creating Index [{}], shards [{}]/[{}{}]",
sIndexName,
settings.get(SETTING_NUMBER_OF_SHARDS),
settings.get(SETTING_NUMBER_OF_REPLICAS),
IndexMetaData.isIndexUsingShadowReplicas(settings) ? "s" : "");
Settings indexSettings = settingsBuilder()
.put(this.settings)

7
src/test/java/org/elasticsearch/index/IndexWithShadowReplicasTests.java
View File

@ -47,10 +47,7 @@ import java.util.concurrent.ExecutionException;
import static com.google.common.collect.Lists.newArrayList;
import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.hamcrest.Matchers.*;
/**
* Tests for indices that use shadow replicas and a shared filesystem
@ -120,7 +117,7 @@ public class IndexWithShadowReplicasTests extends ElasticsearchIntegrationTest {
}
@Test
@Test
public void testIndexWithFewDocuments() throws Exception {
Settings nodeSettings = ImmutableSettings.builder()
.put("node.add_id_to_custom_path", false)