Browse Source

db cassandra: update download url, fix bugs

marko asplund 11 years ago
parent
commit
3de2d65527
2 changed files with 8 additions and 7 deletions
  1. 2 2
      config/database_sftp_batch
  2. 6 5
      toolset/setup/linux/installer.py

+ 2 - 2
config/database_sftp_batch

@@ -12,5 +12,5 @@ put config/usr.sbin.mysqld
 put config/60-postgresql-shm.conf
 put config/mysql
 put config/mysql.conf
-mkdir cassandra
-put -r cassandra
+-mkdir cassandra
+put -r config/cassandra

+ 6 - 5
toolset/setup/linux/installer.py

@@ -561,18 +561,19 @@ class Installer:
     # Apache Cassandra
     ##############################
     export CASS_V=2.0.7
-    wget http://www.apache.org/dist/cassandra/$CASS_V/apache-cassandra-$CASS_V-bin.tar.gz
+    wget http://archive.apache.org/dist/cassandra/$CASS_V/apache-cassandra-$CASS_V-bin.tar.gz
     tar xzf apache-cassandra-$CASS_V-bin.tar.gz
     rm apache-cassandra-*-bin.tar.gz
     fuser -k -TERM /ssd/log/cassandra/system.log
     sleep 5
-    rm -rf /ssd/cassandra
-    rm /ssd/log/cassandra/system.log
+    rm -rf /ssd/cassandra /ssd/log/cassandra
+    sudo mkdir -p /ssd/cassandra /ssd/log/cassandra
+    sudo chown tfb:tfb /ssd/cassandra /ssd/log/cassandra
     cp cassandra/cassandra.yaml apache-cassandra-$CASS_V/conf
     cp cassandra/log4j-server.properties apache-cassandra-$CASS_V/conf
     pushd apache-cassandra-$CASS_V
-    ./bin/cassandra
-    sleep 5
+    nohup ./bin/cassandra
+    sleep 10
     cat ../cassandra/create-keyspace.cql | ./bin/cqlsh tfbdata
     python ../cassandra/db-data-gen.py | ./bin/cqlsh tfbdata
     popd