summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2018-02-08 22:47:48 +0100
committerHarald Musum <musum@oath.com>2018-02-08 22:47:48 +0100
commitb20ab8d9a79a83e8d519641933b93de8e2acaad6 (patch)
treeace6fe1d9aae9bbc48824f5f2ac71ff55bc91df6
parentbd90807da307dc205f24386f1b96546dd1b039c5 (diff)
Remove unused generation of file distribution config
Previously used for generating config for file distributor running on config server
-rwxr-xr-xconfig/src/apps/vespa-config/vespa-config.pl58
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";