diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-11-10 21:52:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-10 21:52:26 +0100 |
| commit | 7dc5186f858d59686bf2f0ceb052ccd5e30ada38 (patch) | |
| tree | 0966ffdf0e073482eba3b8893c2b79c548a2de19 | |
| parent | 9d2313bb170c997320e58199ffb219e0dfb232d8 (diff) | |
| parent | cd99c2faac3e74f45d4c47216ba2364f6a98f3d0 (diff) | |
Merge pull request #4088 from vespa-engine/hmusum/use-config-proxy-port-if-filedistributor-disabled
If filedistributor is disabled, use config proxy port to ask for files
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributorService.java | 4 | ||||
| -rw-r--r-- | config-model/src/main/resources/schema/admin.rnc | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributorService.java b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributorService.java index 98e230cb8ba..dd9e057e2fa 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributorService.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributorService.java @@ -90,7 +90,9 @@ public class FileDistributorService extends AbstractService implements @Override public void getConfig(FiledistributorrpcConfig.Builder builder) { - builder.connectionspec("tcp/" + getHostName() + ":" + getRelativePort(0)); + // If disabled config proxy should act as file distributor, so use config proxy port + int port = (fileDistributionOptions.disabled()) ? 19090 : getRelativePort(0); + builder.connectionspec("tcp/" + getHostName() + ":" + port); } @Override diff --git a/config-model/src/main/resources/schema/admin.rnc b/config-model/src/main/resources/schema/admin.rnc index 1b0d487a388..a88109663eb 100644 --- a/config-model/src/main/resources/schema/admin.rnc +++ b/config-model/src/main/resources/schema/admin.rnc @@ -84,7 +84,7 @@ LogServer = element logserver { FileDistribution = element filedistribution { element uploadbitrate { xsd:string { pattern = "\d+(\.\d*)?\s*[kmgKMG]?" } }? & element downloadbitrate { xsd:string { pattern = "\d+(\.\d*)?\s*[kmgKMG]?" } }? & - element disabled { xsd:boolean }? + element disabled { xsd:boolean }? # Nov. 2017: Temporary, should not be documented } Metrics = element metrics { |