Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1) Better logging of master doing version checking 

2) Exception out when the scv cannot find its indexer
This commit is contained in:
Eric Tschetter 2013-03-13 19:15:29 -05:00
parent 2bd34f1454
commit 4c165b4880
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
merger/src/main/java/com/metamx/druid/merger/common/actions/RemoteTaskActionClient.java
View File

@ -3,6 +3,7 @@ package com.metamx.druid.merger.common.actions;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import com.google.common.base.Charsets; import com.google.common.base.Charsets;
import com.google.common.base.Throwables; import com.google.common.base.Throwables;
import com.metamx.common.ISE;
import com.metamx.common.logger.Logger; import com.metamx.common.logger.Logger;
import com.metamx.druid.merger.common.task.Task; import com.metamx.druid.merger.common.task.Task;
import com.metamx.http.client.HttpClient; import com.metamx.http.client.HttpClient;
@ -63,6 +64,10 @@ public class RemoteTaskActionClient implements TaskActionClient
final int port; final int port;
final String path = "/mmx/merger/v1/action"; final String path = "/mmx/merger/v1/action";
if (instance == null) {
throw new ISE("Cannot find instance of indexer to talk to!");
}
host = instance.getAddress(); host = instance.getAddress();
if (instance.getSslPort() != null && instance.getSslPort() > 0) { if (instance.getSslPort() != null && instance.getSslPort() > 0) {

1
server/src/main/java/com/metamx/druid/master/DruidMaster.java
View File

@ -526,6 +526,7 @@ public class DruidMaster
final Integer binaryVersion = dataSegment.getBinaryVersion(); final Integer binaryVersion = dataSegment.getBinaryVersion();
if (binaryVersion == null || binaryVersion < IndexIO.CURRENT_VERSION_ID) { if (binaryVersion == null || binaryVersion < IndexIO.CURRENT_VERSION_ID) {
log.info("Upgrading version on segment[%s]", dataSegment.getIdentifier());
indexingServiceClient.upgradeSegment(dataSegment); indexingServiceClient.upgradeSegment(dataSegment);
} }
} }