Skip to content

Commit 495c375

Browse files
thecoopthecoop
authored
Ensure log4j plugins are enabled for various perf benchmarks (elastic#143041)
1 parent 548b5f0 commit 495c375

10 files changed

+24
-3
lines changed

‎benchmarks/src/main/java/org/elasticsearch/benchmark/vector/scorer/VectorScorerByteBenchmark.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.apache.lucene.util.hnsw.RandomVectorScorer;
2121
import org.apache.lucene.util.hnsw.UpdateableRandomVectorScorer;
2222
import org.elasticsearch.common.logging.LogConfigurator;
23+
import org.elasticsearch.common.logging.NodeNamePatternConverter;
2324
import org.elasticsearch.simdvec.VectorScorerFactory;
2425
import org.elasticsearch.simdvec.VectorSimilarityType;
2526
import org.openjdk.jmh.annotations.Benchmark;
@@ -62,6 +63,8 @@
6263
public class VectorScorerByteBenchmark {
6364

6465
static {
66+
NodeNamePatternConverter.setGlobalNodeName("benchmark");
67+
LogConfigurator.loadLog4jPlugins();
6568
LogConfigurator.configureESLogging(); // native access requires logging to be initialized
6669
if (supportsHeapSegments() == false) {
6770
final Logger LOG = LogManager.getLogger(VectorScorerByteBenchmark.class);

‎benchmarks/src/main/java/org/elasticsearch/benchmark/vector/scorer/VectorScorerByteBulkBenchmark.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.apache.lucene.util.hnsw.RandomVectorScorer;
2222
import org.apache.lucene.util.hnsw.UpdateableRandomVectorScorer;
2323
import org.elasticsearch.common.logging.LogConfigurator;
24+
import org.elasticsearch.common.logging.NodeNamePatternConverter;
2425
import org.elasticsearch.simdvec.VectorScorerFactory;
2526
import org.elasticsearch.simdvec.VectorSimilarityType;
2627
import org.openjdk.jmh.annotations.Benchmark;
@@ -69,6 +70,8 @@
6970
public class VectorScorerByteBulkBenchmark {
7071

7172
static {
73+
NodeNamePatternConverter.setGlobalNodeName("benchmark");
74+
LogConfigurator.loadLog4jPlugins();
7275
LogConfigurator.configureESLogging(); // native access requires logging to be initialized
7376
if (supportsHeapSegments() == false) {
7477
final Logger LOG = LogManager.getLogger(VectorScorerByteBulkBenchmark.class);

‎benchmarks/src/main/java/org/elasticsearch/benchmark/vector/scorer/VectorScorerFloat32OperationBenchmark.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
public class VectorScorerFloat32OperationBenchmark {
4848

4949
static {
50-
NodeNamePatternConverter.setGlobalNodeName("foo");
50+
NodeNamePatternConverter.setGlobalNodeName("benchmark");
5151
LogConfigurator.loadLog4jPlugins();
5252
LogConfigurator.configureESLogging(); // native access requires logging to be initialized
5353
}

‎benchmarks/src/main/java/org/elasticsearch/benchmark/vector/scorer/VectorScorerFloatBenchmark.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.apache.lucene.util.hnsw.RandomVectorScorer;
1818
import org.apache.lucene.util.hnsw.UpdateableRandomVectorScorer;
1919
import org.elasticsearch.common.logging.LogConfigurator;
20+
import org.elasticsearch.common.logging.NodeNamePatternConverter;
2021
import org.elasticsearch.core.IOUtils;
2122
import org.elasticsearch.logging.LogManager;
2223
import org.elasticsearch.logging.Logger;
@@ -64,6 +65,8 @@
6465
public class VectorScorerFloatBenchmark {
6566

6667
static {
68+
NodeNamePatternConverter.setGlobalNodeName("benchmark");
69+
LogConfigurator.loadLog4jPlugins();
6770
LogConfigurator.configureESLogging(); // native access requires logging to be initialized
6871
if (supportsHeapSegments() == false) {
6972
final Logger LOG = LogManager.getLogger(VectorScorerFloatBenchmark.class);

‎benchmarks/src/main/java/org/elasticsearch/benchmark/vector/scorer/VectorScorerFloatBulkBenchmark.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import org.apache.lucene.util.hnsw.RandomVectorScorer;
1919
import org.apache.lucene.util.hnsw.UpdateableRandomVectorScorer;
2020
import org.elasticsearch.common.logging.LogConfigurator;
21+
import org.elasticsearch.common.logging.NodeNamePatternConverter;
2122
import org.elasticsearch.core.IOUtils;
2223
import org.elasticsearch.logging.LogManager;
2324
import org.elasticsearch.logging.Logger;
@@ -70,6 +71,8 @@
7071
public class VectorScorerFloatBulkBenchmark {
7172

7273
static {
74+
NodeNamePatternConverter.setGlobalNodeName("benchmark");
75+
LogConfigurator.loadLog4jPlugins();
7376
LogConfigurator.configureESLogging(); // native access requires logging to be initialized
7477
if (supportsHeapSegments() == false) {
7578
final Logger LOG = LogManager.getLogger(VectorScorerFloatBulkBenchmark.class);

‎benchmarks/src/main/java/org/elasticsearch/benchmark/vector/scorer/VectorScorerInt7uBenchmark.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.apache.lucene.util.hnsw.RandomVectorScorer;
1717
import org.apache.lucene.util.hnsw.UpdateableRandomVectorScorer;
1818
import org.elasticsearch.common.logging.LogConfigurator;
19+
import org.elasticsearch.common.logging.NodeNamePatternConverter;
1920
import org.elasticsearch.core.IOUtils;
2021
import org.elasticsearch.logging.LogManager;
2122
import org.elasticsearch.logging.Logger;
@@ -64,6 +65,8 @@
6465
public class VectorScorerInt7uBenchmark {
6566

6667
static {
68+
NodeNamePatternConverter.setGlobalNodeName("benchmark");
69+
LogConfigurator.loadLog4jPlugins();
6770
LogConfigurator.configureESLogging(); // native access requires logging to be initialized
6871
if (supportsHeapSegments() == false) {
6972
final Logger LOG = LogManager.getLogger(VectorScorerInt7uBenchmark.class);

‎benchmarks/src/main/java/org/elasticsearch/benchmark/vector/scorer/VectorScorerInt7uBulkBenchmark.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.apache.lucene.util.hnsw.UpdateableRandomVectorScorer;
1818
import org.apache.lucene.util.quantization.QuantizedByteVectorValues;
1919
import org.elasticsearch.common.logging.LogConfigurator;
20+
import org.elasticsearch.common.logging.NodeNamePatternConverter;
2021
import org.elasticsearch.core.IOUtils;
2122
import org.elasticsearch.logging.LogManager;
2223
import org.elasticsearch.logging.Logger;
@@ -70,6 +71,8 @@
7071
public class VectorScorerInt7uBulkBenchmark {
7172

7273
static {
74+
NodeNamePatternConverter.setGlobalNodeName("benchmark");
75+
LogConfigurator.loadLog4jPlugins();
7376
LogConfigurator.configureESLogging(); // native access requires logging to be initialized
7477
if (supportsHeapSegments() == false) {
7578
final Logger LOG = LogManager.getLogger(VectorScorerInt7uBulkBenchmark.class);

‎benchmarks/src/main/java/org/elasticsearch/benchmark/vector/scorer/VectorScorerInt7uOperationBenchmark.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
public class VectorScorerInt7uOperationBenchmark {
4646

4747
static {
48-
NodeNamePatternConverter.setGlobalNodeName("foo");
48+
NodeNamePatternConverter.setGlobalNodeName("benchmark");
4949
LogConfigurator.loadLog4jPlugins();
5050
LogConfigurator.configureESLogging(); // native access requires logging to be initialized
5151
}

‎benchmarks/src/main/java/org/elasticsearch/benchmark/vector/scorer/VectorScorerInt8OperationBenchmark.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
public class VectorScorerInt8OperationBenchmark {
4747

4848
static {
49-
NodeNamePatternConverter.setGlobalNodeName("foo");
49+
NodeNamePatternConverter.setGlobalNodeName("benchmark");
5050
LogConfigurator.loadLog4jPlugins();
5151
LogConfigurator.configureESLogging(); // native access requires logging to be initialized
5252
}

‎benchmarks/src/main/java/org/elasticsearch/benchmark/vector/scorer/VectorScorerOSQBenchmark.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import org.apache.lucene.store.NIOFSDirectory;
1919
import org.apache.lucene.util.VectorUtil;
2020
import org.elasticsearch.common.logging.LogConfigurator;
21+
import org.elasticsearch.common.logging.NodeNamePatternConverter;
2122
import org.elasticsearch.core.IOUtils;
2223
import org.elasticsearch.index.codec.vectors.diskbbq.next.ESNextDiskBBQVectorsFormat;
2324
import org.elasticsearch.simdvec.ESNextOSQVectorsScorer;
@@ -60,6 +61,8 @@
6061
public class VectorScorerOSQBenchmark {
6162

6263
static {
64+
NodeNamePatternConverter.setGlobalNodeName("benchmark");
65+
LogConfigurator.loadLog4jPlugins();
6366
LogConfigurator.configureESLogging(); // native access requires logging to be initialized
6467
}
6568

0 commit comments

Comments
 (0)