Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 49B5371F3 for ; Tue, 29 Nov 2011 17:21:35 +0000 (UTC) Received: (qmail 50291 invoked by uid 500); 29 Nov 2011 17:21:35 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 50218 invoked by uid 500); 29 Nov 2011 17:21:35 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Delivered-To: moderator for commits@cassandra.apache.org Received: (qmail 23121 invoked by uid 99); 29 Nov 2011 11:30:52 -0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of 3U8LUTiAMAKYIGYYGTJXG-TUJK.GVGINK-KdZXGY.UXMIUJKYVUZ.IUS@codesite.bounces.google.com designates 209.85.216.76 as permitted sender) MIME-Version: 1.0 X-Generated-By: Google Code Message-ID: <20cf306f72542730b804b2ddf22f@google.com> Date: Tue, 29 Nov 2011 11:30:27 +0000 Subject: [cassandra-node] 6 new revisions pushed by tomaz.muraus on 2011-11-29 11:29 GMT From: cassandra-node.apache-extras.org@codespot.com To: commits@cassandra.apache.org Content-Type: text/plain; charset=ISO-8859-1; format=flowed; delsp=yes 6 new revisions: Revision: de0763c03832 Author: Tomaz Muraus Date: Tue Nov 29 03:12:03 2011 Log: Upgrade whiskey to 0.6.1 http://code.google.com/a/apache-extras.org/p/cassandra-node/source/detail?r=de0763c03832 Revision: 864dd41af682 Author: Tomaz Muraus Date: Tue Nov 29 03:18:53 2011 Log: Add Cassandra test configs and binary wrapper. http://code.google.com/a/apache-extras.org/p/cassandra-node/source/detail?r=864dd41af682 Revision: 652e6524e6a5 Author: Tomaz Muraus Date: Tue Nov 29 03:19:18 2011 Log: Add Whiskey dependencies file. http://code.google.com/a/apache-extras.org/p/cassandra-node/source/detail?r=652e6524e6a5 Revision: e643a25a253e Author: Tomaz Muraus Date: Tue Nov 29 03:21:24 2011 Log: Update npm test target. http://code.google.com/a/apache-extras.org/p/cassandra-node/source/detail?r=e643a25a253e Revision: 9fc86ce1b750 Author: Tomaz Muraus Date: Tue Nov 29 03:23:29 2011 Log: Allow user to specify path to the cassandra home by setting environmen... http://code.google.com/a/apache-extras.org/p/cassandra-node/source/detail?r=9fc86ce1b750 Revision: 4581c60e6c24 Author: Tomaz Muraus Date: Tue Nov 29 03:24:53 2011 Log: Update .gitignore and .npmignore. http://code.google.com/a/apache-extras.org/p/cassandra-node/source/detail?r=4581c60e6c24 ============================================================================== Revision: de0763c03832 Author: Tomaz Muraus Date: Tue Nov 29 03:12:03 2011 Log: Upgrade whiskey to 0.6.1 http://code.google.com/a/apache-extras.org/p/cassandra-node/source/detail?r=de0763c03832 Modified: /package.json ======================================= --- /package.json Fri Nov 11 07:49:04 2011 +++ /package.json Tue Nov 29 03:12:03 2011 @@ -27,7 +27,7 @@ "thrift" : ">= 0.6.0-1", "logmagic": ">= 0.1.1", "generic-pool" : ">= 1.0.7", - "whiskey": ">= 0.3.0", + "whiskey": ">= 0.6.1", "uuid-js": ">= 0.5.2" }, "devDependencies": {}, ============================================================================== Revision: 864dd41af682 Author: Tomaz Muraus Date: Tue Nov 29 03:18:53 2011 Log: Add Cassandra test configs and binary wrapper. http://code.google.com/a/apache-extras.org/p/cassandra-node/source/detail?r=864dd41af682 Added: /test/cass.sh /test/conf/cassandra.yaml /test/conf/log4j-server.properties ======================================= --- /dev/null +++ /test/cass.sh Tue Nov 29 03:18:53 2011 @@ -0,0 +1,9 @@ +#!/bin/bash + +basedir=`dirname $0` + +export CASSANDRA_CONF=$basedir/conf/ + +rm -rf /tmp/cass/* + +exec /opt/cassandra/bin/cassandra -f ======================================= --- /dev/null +++ /test/conf/cassandra.yaml Tue Nov 29 03:18:53 2011 @@ -0,0 +1,47 @@ +authenticator: org.apache.cassandra.auth.AllowAllAuthenticator +authority: org.apache.cassandra.auth.AllowAllAuthority +auto_bootstrap: true +cluster_name: Test Cluster +column_index_size_in_kb: 64 +commitlog_directory: [/tmp/cass/commitlog] +commitlog_sync: periodic +commitlog_sync_period_in_ms: 10000 +compaction_preheat_key_cache: true +concurrent_reads: 4 +concurrent_writes: 4 +data_file_directories: [/tmp/cass/data] +dynamic_snitch: true +dynamic_snitch_badness_threshold: 0.0 +dynamic_snitch_reset_interval_in_ms: 600000 +dynamic_snitch_update_interval_in_ms: 100 +encryption_options: {internode_encryption: none, keystore: conf/.keystore, keystore_password: cassandra, + truststore: conf/.truststore, truststore_password: cassandra} +endpoint_snitch: org.apache.cassandra.locator.SimpleSnitch +flush_largest_memtables_at: 0.75 +hinted_handoff_enabled: false +hinted_handoff_throttle_delay_in_ms: 50 +in_memory_compaction_limit_in_mb: 64 +incremental_backups: false +index_interval: 128 +initial_token: 0 +listen_address: 127.0.0.1 +max_hint_window_in_ms: 3600000 +memtable_flush_queue_size: 4 +partitioner: org.apache.cassandra.dht.ByteOrderedPartitioner +reduce_cache_capacity_to: 0.59999999999999998 +reduce_cache_sizes_at: 0.84999999999999998 +request_scheduler: org.apache.cassandra.scheduler.NoScheduler +rpc_address: 127.0.0.1 +rpc_keepalive: true +rpc_port: 19170 +rpc_timeout_in_ms: 10000 +saved_caches_directory: [/tmp/cass/savedcaches] +seed_provider: +- class_name: org.apache.cassandra.locator.SimpleSeedProvider + parameters: + - {seeds: 127.0.0.1} +sliced_buffer_size_in_kb: 64 +snapshot_before_compaction: false +storage_port: 17001 +thrift_framed_transport_size_in_mb: 15 +thrift_max_message_length_in_mb: 16 ======================================= --- /dev/null +++ /test/conf/log4j-server.properties Tue Nov 29 03:18:53 2011 @@ -0,0 +1,40 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# for production, you should probably set pattern to %c instead of %l. +# (%l is slower.) + +# output messages into a rolling log file as well as stdout +log4j.rootLogger=TRACE,stdout,R + +# stdout +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p %d{HH:mm:ss,SSS} %m%n + +# rolling log file +log4j.appender.R=org.apache.log4j.RollingFileAppender +log4j.appender.R.maxFileSize=20MB +log4j.appender.R.maxBackupIndex=50 +log4j.appender.R.layout=org.apache.log4j.PatternLayout +log4j.appender.R.layout.ConversionPattern=%5p [%t] %d{ISO8601} %F (line %L) %m%n +# Edit the next line to point to your logs directory +log4j.appender.R.File=/tmp/cass/system.log + +# Application logging options +#log4j.logger.org.apache.cassandra=DEBUG +#log4j.logger.org.apache.cassandra.db=DEBUG +#log4j.logger.org.apache.cassandra.service.StorageProxy=DEBUG ============================================================================== Revision: 652e6524e6a5 Author: Tomaz Muraus Date: Tue Nov 29 03:19:18 2011 Log: Add Whiskey dependencies file. http://code.google.com/a/apache-extras.org/p/cassandra-node/source/detail?r=652e6524e6a5 Added: /test/dependencies.json ======================================= --- /dev/null +++ /test/dependencies.json Tue Nov 29 03:19:18 2011 @@ -0,0 +1,13 @@ +{ + "cassandra": { + "cmd": ["test/cass.sh"], + "cwd": ["__dirname", ".."], + "log_file": "test-cassandra.log", + "wait_for": "socket", + "wait_for_options": { + "host": "127.0.0.1", + "port": 19170 + }, + "timeout": 10000 + } +} ============================================================================== Revision: e643a25a253e Author: Tomaz Muraus Date: Tue Nov 29 03:21:24 2011 Log: Update npm test target. http://code.google.com/a/apache-extras.org/p/cassandra-node/source/detail?r=e643a25a253e Modified: /package.json ======================================= --- /package.json Tue Nov 29 03:12:03 2011 +++ /package.json Tue Nov 29 03:21:24 2011 @@ -17,7 +17,7 @@ "lib": "lib" }, "scripts": { - "test": "whiskey --tests \"test/test_driver.js\"" + "test": "whiskey --tests \"test/test_driver.js test/test_decoder.js test/test_uuid.js\" --dependencies test/dependencies.json" }, "engines": { "node": ">= 0.4.0" ============================================================================== Revision: 9fc86ce1b750 Author: Tomaz Muraus Date: Tue Nov 29 03:23:29 2011 Log: Allow user to specify path to the cassandra home by setting environment variable. http://code.google.com/a/apache-extras.org/p/cassandra-node/source/detail?r=9fc86ce1b750 Modified: /test/cass.sh ======================================= --- /test/cass.sh Tue Nov 29 03:18:53 2011 +++ /test/cass.sh Tue Nov 29 03:23:29 2011 @@ -4,6 +4,10 @@ export CASSANDRA_CONF=$basedir/conf/ -rm -rf /tmp/cass/* - -exec /opt/cassandra/bin/cassandra -f +if [ ! $CASS_HOME ]; then + CASS_HOME="/opt/cassandra" +fi + + +rm -rf /tmp/cass/* +exec $CASS_HOME/bin/cassandra -f ============================================================================== Revision: 4581c60e6c24 Author: Tomaz Muraus Date: Tue Nov 29 03:24:53 2011 Log: Update .gitignore and .npmignore. http://code.google.com/a/apache-extras.org/p/cassandra-node/source/detail?r=4581c60e6c24 Added: /.npmignore Modified: /.gitignore ======================================= --- /dev/null +++ /.npmignore Tue Nov 29 03:24:53 2011 @@ -0,0 +1,1 @@ +test-*.log ======================================= --- /.gitignore Fri Nov 11 07:49:04 2011 +++ /.gitignore Tue Nov 29 03:24:53 2011 @@ -4,5 +4,6 @@ *.iml *.ipr *.iws +test-*.log node_modules node_modules/*