diff options
author | Harald Musum <musum@yahoo-inc.com> | 2018-02-09 06:56:39 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-09 06:56:39 +0100 |
commit | 3e349b470c968586116245ef9a8719002cdf47b7 (patch) | |
tree | c6768c9bebe0050688ccaa53612002ef0263d153 | |
parent | 98287886eafca74a62bb9573ab7f311acc025f2d (diff) | |
parent | b20ab8d9a79a83e8d519641933b93de8e2acaad6 (diff) |
Merge pull request #4986 from vespa-engine/hmusum/remove-filedistributor-config-generation
Remove unused generation of file distribution config
-rwxr-xr-x | config/src/apps/vespa-config/vespa-config.pl | 58 |
1 files changed, 1 insertions, 57 deletions
diff --git a/config/src/apps/vespa-config/vespa-config.pl b/config/src/apps/vespa-config/vespa-config.pl index d54d7af4418..61a1714873a 100755 --- a/config/src/apps/vespa-config/vespa-config.pl +++ b/config/src/apps/vespa-config/vespa-config.pl @@ -237,57 +237,6 @@ sub printConfigHttpSources { print $out . "\n"; } -sub makeFiledistributorZKConfig { - my $cfgFile = $VESPA_HOME . "/conf/filedistributor/zookeepers.cfg"; - open(CFG, "> ${cfgFile}.new") or die "Cannot write to '${cfgFile}.new'"; - my $zkservers = getZKString(); - print CFG "zookeeperserverlist \"$zkservers\"\n"; - close(CFG); - rename("${cfgFile}.new", ${cfgFile}) - or die "Cannot rename '${cfgFile}.new' -> '${cfgFile}': $!\n"; - print STDERR "wrote '${cfgFile}' \n"; -} - -sub makeFiledistributorDistributorConfig { - my $cfgFile = $VESPA_HOME . "/conf/filedistributor/filedistributor.cfg"; - open(CFG, "> ${cfgFile}.new") or die "Cannot write to '${cfgFile}.new'"; - print CFG "torrentport 19093\n"; - print CFG "hostname \"$myHostname\"\n"; - print CFG "filedbpath \"$VESPA_HOME" . "/var/db/vespa/filedistribution\"\n"; - print CFG "maxdownloadspeed 0\n"; - print CFG "maxuploadspeed 0\n"; - close(CFG); - rename("${cfgFile}.new", ${cfgFile}) - or die "Cannot rename '${cfgFile}.new' -> '${cfgFile}': $!\n"; - print STDERR "wrote '${cfgFile}' \n"; -} - -sub makeFiledistributorRpcConfig { - my $cfgFile = $VESPA_HOME . "/conf/filedistributor/filedistributorrpc.cfg"; - open(CFG, "> ${cfgFile}.new") or die "Cannot write to '${cfgFile}.new'"; - print CFG "connectionspec \"tcp/$myHostname:19092\"\n"; - close(CFG); - rename("${cfgFile}.new", ${cfgFile}) - or die "Cannot rename '${cfgFile}.new' -> '${cfgFile}': $!\n"; - print STDERR "wrote '${cfgFile}' \n"; -} - -sub makeFiledistributorReferencesConfig { - my $cfgFile = $VESPA_HOME . "/conf/filedistributor/filereferences.cfg"; - open(CFG, "> ${cfgFile}.new") or die "Cannot write to '${cfgFile}.new'"; - close(CFG); - rename("${cfgFile}.new", ${cfgFile}) - or die "Cannot rename '${cfgFile}.new' -> '${cfgFile}': $!\n"; - print STDERR "wrote '${cfgFile}' \n"; -} - -sub makeFiledistributorConfig { - makeFiledistributorZKConfig(); - makeFiledistributorDistributorConfig(); - makeFiledistributorRpcConfig(); - makeFiledistributorReferencesConfig(); -} - sub isThisAConfigServer { my $addr; foreach $addr (getConfigServers()) { @@ -321,7 +270,7 @@ sub getLastLine { sub usage { print "usage: "; - print "vespa-config [-configsources | -confighttpsources | -zkstring | -mkfiledistributorconfig | -configserverport | -zkclientport | -isthisaconfigserver]\n"; + print "vespa-config [-configsources | -confighttpsources | -zkstring | -configserverport | -zkclientport | -isthisaconfigserver]\n"; } if ( @ARGV == 0 ) { @@ -356,11 +305,6 @@ if ( $ARGV[0] eq "-configserverport" ) { printConfigServerPort(); exit 0; } -if ( $ARGV[0] eq "-mkfiledistributorconfig" ) { - vespa_base_env(); - makeFiledistributorConfig(); - exit 0; -} if ( $ARGV[0] eq "-zkclientport" ) { vespa_base_env(); print "$zk_client_port\n"; |