Skip to content

Dump config #1160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
reddycharan wants to merge 2 commits into from
Closed

Dump config #1160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
800df5c
Dump config
reddycharan Feb 16, 2018
af98004
Dump config
reddycharan Feb 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/AbstractConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,18 @@
import static org.apache.bookkeeper.conf.ClientConfiguration.CLIENT_AUTH_PROVIDER_FACTORY_CLASS;

import java.net.URL;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

import javax.net.ssl.SSLEngine;

import org.apache.bookkeeper.feature.Feature;
import org.apache.bookkeeper.meta.LedgerManagerFactory;
import org.apache.bookkeeper.util.EntryFormatter;
import org.apache.bookkeeper.util.JsonUtil;
import org.apache.bookkeeper.util.JsonUtil.ParseJsonException;
import org.apache.bookkeeper.util.LedgerIdFormatter;
import org.apache.bookkeeper.util.ReflectionUtils;
import org.apache.bookkeeper.util.StringEntryFormatter;
Expand Down Expand Up @@ -618,4 +623,27 @@ public String getTLSEnabledProtocols() {
* Trickery to allow inheritance with fluent style.
*/
protected abstract T getThis();

/**
* returns the string representation of json format of this config.
*
* @return
* @throws ParseJsonException
*/
public String asJson() throws ParseJsonException {
return JsonUtil.toJson(toMap());
}

private Map<String, Object> toMap() {
Map<String, Object> configMap = new HashMap<>();
Iterator<String> iterator = this.getKeys();
while (iterator.hasNext()) {
String key = iterator.next().toString();
Object property = this.getProperty(key);
if (property != null) {
configMap.put(key, property.toString());
}
}
return configMap;
}
}
9 changes: 9 additions & 0 deletions bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import org.apache.bookkeeper.tls.SecurityException;
import org.apache.bookkeeper.tls.SecurityHandlerFactory;
import org.apache.bookkeeper.tls.SecurityProviderFactoryFactory;
import org.apache.bookkeeper.util.JsonUtil.ParseJsonException;
import org.apache.zookeeper.KeeperException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -81,6 +82,14 @@ public BookieServer(ServerConfiguration conf, StatsLogger statsLogger)
BookieException, UnavailableException, CompatibilityException, SecurityException {
this.conf = conf;
validateUser(conf);
String configAsString;
try {
configAsString = conf.asJson();
LOG.info(configAsString);
} catch (ParseJsonException pe) {
LOG.error("Got ParseJsonException while converting Config to JSONString", pe);
}

this.statsLogger = statsLogger;
this.nettyServer = new BookieNettyServer(this.conf, null);
try {
Expand Down
17 changes: 1 addition & 16 deletions ...-server/src/main/java/org/apache/bookkeeper/server/http/service/ConfigurationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import static com.google.common.base.Preconditions.checkNotNull;

import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;

import org.apache.bookkeeper.conf.ServerConfiguration;
Expand All @@ -48,8 +47,7 @@ public HttpServiceResponse handle(HttpServiceRequest request) throws Exception {
HttpServiceResponse response = new HttpServiceResponse();
// GET
if (HttpServer.Method.GET == request.getMethod()) {
Map<String, Object> configMap = toMap(conf);
String jsonResponse = JsonUtil.toJson(configMap);
String jsonResponse = conf.asJson();
response.setBody(jsonResponse);
return response;
} else if (HttpServer.Method.PUT == request.getMethod()) {
Expand All @@ -75,17 +73,4 @@ public HttpServiceResponse handle(HttpServiceRequest request) throws Exception {
}

}

private Map<String, Object> toMap(ServerConfiguration conf) {
Map<String, Object> configMap = new HashMap<>();
Iterator iterator = conf.getKeys();
while (iterator.hasNext()) {
String key = iterator.next().toString();
Object property = conf.getProperty(key);
if (property != null) {
configMap.put(key, property.toString());
}
}
return configMap;
}
}