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

adapt to additional changes, attributes is now a regular map in DiscoveryNode 

Original commit: elastic/x-pack-elasticsearch@0ba590ed9b
This commit is contained in:
javanna 2016-03-29 12:34:14 +02:00 committed by Luca Cavanna
parent 257ae2cb44
commit d31983d6b6
4 changed files with 28 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/exporter/MonitoringDoc.java
View File

@ -5,9 +5,7 @@
*/
package org.elasticsearch.marvel.agent.exporter;
import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.common.collect.ImmutableOpenMap;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.io.stream.Writeable;
@ -16,6 +14,9 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentBuilderString;
import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
/**
* Base class for all monitoring documents.
@ -107,23 +108,20 @@ public class MonitoringDoc implements Writeable<MonitoringDoc> {
private String transportAddress;
private String ip;
private String name;
private ImmutableOpenMap<String, String> attributes;
private Map<String, String> attributes;
public Node(String uuid, String host, String transportAddress, String ip, String name,
ImmutableOpenMap<String, String> attributes) {
Map<String, String> attributes) {
this.uuid = uuid;
this.host = host;
this.transportAddress = transportAddress;
this.ip = ip;
this.name = name;
ImmutableOpenMap.Builder<String, String> builder = ImmutableOpenMap.builder();
if (attributes != null) {
for (ObjectObjectCursor<String, String> entry : attributes) {
builder.put(entry.key.intern(), entry.value.intern());
}
if (attributes == null) {
this.attributes = new HashMap<>();
} else {
this.attributes = Collections.unmodifiableMap(attributes);
}
this.attributes = builder.build();
}
public Node(StreamInput in) throws IOException {
@ -133,11 +131,10 @@ public class MonitoringDoc implements Writeable<MonitoringDoc> {
ip = in.readOptionalString();
name = in.readOptionalString();
int size = in.readVInt();
ImmutableOpenMap.Builder<String, String> attributes = ImmutableOpenMap.builder(size);
this.attributes = new HashMap<>();
for (int i = 0; i < size; i++) {
attributes.put(in.readOptionalString(), in.readOptionalString());
attributes.put(in.readString(), in.readString());
}
this.attributes = attributes.build();
}
public String getUUID() {
@ -160,7 +157,7 @@ public class MonitoringDoc implements Writeable<MonitoringDoc> {
return name;
}
public ImmutableOpenMap<String, String> getAttributes() {
public Map<String, String> getAttributes() {
return attributes;
}
@ -174,8 +171,8 @@ public class MonitoringDoc implements Writeable<MonitoringDoc> {
builder.field(Fields.NAME, getName());
builder.startObject(Fields.ATTRIBUTES);
for (ObjectObjectCursor<String, String> attr : getAttributes()) {
builder.field(attr.key, attr.value);
for (Map.Entry<String, String> entry : getAttributes().entrySet()) {
builder.field(entry.getKey(), entry.getValue());
}
builder.endObject();
return builder.endObject();
@ -190,9 +187,9 @@ public class MonitoringDoc implements Writeable<MonitoringDoc> {
out.writeOptionalString(name);
if (attributes != null) {
out.writeVInt(attributes.size());
for (ObjectObjectCursor<String, String> entry : attributes) {
out.writeOptionalString(entry.key);
out.writeOptionalString(entry.value);
for (Map.Entry<String, String> entry : attributes.entrySet()) {
out.writeString(entry.getKey());
out.writeString(entry.getValue());
}
} else {
out.writeVInt(0);

6
elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/cluster/DiscoveryNodeResolver.java
View File

@ -5,7 +5,6 @@
*/
package org.elasticsearch.marvel.agent.resolver.cluster;
import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder;
@ -14,6 +13,7 @@ import org.elasticsearch.marvel.agent.collector.cluster.DiscoveryNodeMonitoringD
import org.elasticsearch.marvel.agent.resolver.MonitoringIndexNameResolver;
import java.io.IOException;
import java.util.Map;
public class DiscoveryNodeResolver extends MonitoringIndexNameResolver.Data<DiscoveryNodeMonitoringDoc> {
@ -44,8 +44,8 @@ public class DiscoveryNodeResolver extends MonitoringIndexNameResolver.Data<Disc
builder.field(Fields.TRANSPORT_ADDRESS, node.getAddress().toString());
builder.startObject(Fields.ATTRIBUTES);
for (ObjectObjectCursor<String, String> attr : node.getAttributes()) {
builder.field(attr.key, attr.value);
for (Map.Entry<String, String> entry : node.getAttributes().entrySet()) {
builder.field(entry.getKey(), entry.getValue());
}
builder.endObject();
builder.field(Fields.ID, node.getId());

12
elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/action/MonitoringBulkDocTests.java
View File

@ -7,13 +7,14 @@ package org.elasticsearch.marvel.action;
import org.elasticsearch.Version;
import org.elasticsearch.common.bytes.BytesArray;
import org.elasticsearch.common.collect.ImmutableOpenMap;
import org.elasticsearch.common.io.stream.BytesStreamOutput;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.marvel.agent.exporter.MonitoringDoc;
import org.elasticsearch.test.ESTestCase;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import static org.elasticsearch.test.VersionUtils.randomVersion;
import static org.hamcrest.Matchers.equalTo;
@ -78,7 +79,7 @@ public class MonitoringBulkDocTests extends ESTestCase {
String ip = null;
String transportAddress = null;
String host = null;
ImmutableOpenMap<String, String> attributes = null;
Map<String, String> attributes = null;
if (frequently()) {
uuid = randomAsciiOfLength(5);
@ -91,14 +92,11 @@ public class MonitoringBulkDocTests extends ESTestCase {
}
if (rarely()) {
int nbAttributes = randomIntBetween(0, 5);
ImmutableOpenMap.Builder<String, String> builder = ImmutableOpenMap.builder();
attributes = new HashMap<>();
for (int i = 0; i < nbAttributes; i++) {
builder.put("key#" + i, String.valueOf(i));
attributes.put("key#" + i, String.valueOf(i));
}
attributes = builder.build();
}
return new MonitoringDoc.Node(uuid, host, transportAddress, ip, name, attributes);
}
}

9
elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/exporter/MonitoringDocTests.java
View File

@ -7,7 +7,6 @@ package org.elasticsearch.marvel.agent.exporter;
import org.elasticsearch.Version;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.common.collect.ImmutableOpenMap;
import org.elasticsearch.common.io.stream.BytesStreamOutput;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.transport.DummyTransportAddress;
@ -101,7 +100,7 @@ public class MonitoringDocTests extends ESTestCase {
String ip = null;
String transportAddress = null;
String host = null;
ImmutableOpenMap<String, String> attributes = null;
Map<String, String> attributes = null;
if (frequently()) {
uuid = randomAsciiOfLength(5);
@ -114,12 +113,10 @@ public class MonitoringDocTests extends ESTestCase {
}
if (rarely()) {
int nbAttributes = randomIntBetween(0, 5);
ImmutableOpenMap.Builder<String, String> builder = ImmutableOpenMap.builder();
attributes = new HashMap<>();
for (int i = 0; i < nbAttributes; i++) {
builder.put("key#" + i, String.valueOf(i));
attributes.put("key#" + i, String.valueOf(i));
}
attributes = builder.build();
}
return new MonitoringDoc.Node(uuid, host, transportAddress, ip, name, attributes);
}