mirror of https://github.com/apache/cassandra
merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1091784 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis
parent
9fd80e3e54
commit
58307994b5
|
|
@ -18,9 +18,11 @@
|
|||
* purge tombstones from row cache (CASSANDRA-2305)
|
||||
* push replication_factor into strategy_options (CASSANDRA-1263)
|
||||
* give snapshots the same name on each node (CASSANDRA-1791)
|
||||
* remove "nodetool loadbalance" (CASSANDRA-2448)
|
||||
* multithreaded compaction (CASSANDRA-2191)
|
||||
* compaction throttling (CASSANDRA-2156)
|
||||
* add key type information and alias (CASSANDRA-2311, 2396)
|
||||
* cli no longer divides read_repair_chance by 100 (CASSANDRA-2458)
|
||||
|
||||
|
||||
0.7.5
|
||||
|
|
|
|||
7
NEWS.txt
7
NEWS.txt
|
|
@ -1,5 +1,5 @@
|
|||
Whatever
|
||||
========
|
||||
0.8
|
||||
===
|
||||
|
||||
Upgrading
|
||||
---------
|
||||
|
|
@ -10,6 +10,9 @@ Upgrading
|
|||
Upgrading from version 0.7.1 or later can be done with a rolling restart,
|
||||
one node at a time. You do not need to bring down the whole cluster.
|
||||
|
||||
The loadbalance command has been removed from nodetool. For similar
|
||||
behavior, decommission then rebootstrap with empty initial_token.
|
||||
|
||||
Other
|
||||
-----
|
||||
In the past, sstable2json would write column names and values as hex
|
||||
|
|
|
|||
|
|
@ -615,7 +615,7 @@
|
|||
<jvmarg value="-Dstorage-config=${test.conf}"/>
|
||||
<jvmarg value="-Daccess.properties=${test.conf}/access.properties"/>
|
||||
<jvmarg value="-Dlog4j.configuration=log4j-junit.properties" />
|
||||
<jvmarg value="-javaagent:${basedir}/lib/jamm-0.2.jar" />
|
||||
<jvmarg value="-javaagent:${basedir}/lib/jamm-0.2.1.jar" />
|
||||
<jvmarg value="-ea"/>
|
||||
<optjvmargs/>
|
||||
<classpath>
|
||||
|
|
|
|||
|
|
@ -92,7 +92,11 @@ JMX_PORT="7199"
|
|||
JVM_OPTS="$JVM_OPTS -ea"
|
||||
|
||||
# add the jamm javaagent
|
||||
JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.jar"
|
||||
java_version=`java -version 2>&1`
|
||||
if [[ $java_version != *OpenJDK* ]]
|
||||
then
|
||||
JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.1.jar"
|
||||
fi
|
||||
|
||||
# enable thread priorities, primarily so we can give periodic tasks
|
||||
# a lower priority to avoid interfering with client workload
|
||||
|
|
|
|||
Binary file not shown.
BIN
lib/jamm-0.2.jar
BIN
lib/jamm-0.2.jar
Binary file not shown.
|
|
@ -0,0 +1,202 @@
|
|||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed 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.
|
||||
|
|
@ -1039,10 +1039,10 @@ public class CliClient extends CliUserHelp
|
|||
cfDef.setKey_cache_size(Double.parseDouble(mValue));
|
||||
break;
|
||||
case READ_REPAIR_CHANCE:
|
||||
double chance = Double.parseDouble(mValue) / 100;
|
||||
double chance = Double.parseDouble(mValue);
|
||||
|
||||
if (chance > 1)
|
||||
throw new RuntimeException("Error: read_repair_chance / 100 should not be greater than 1.");
|
||||
if (chance < 0 || chance > 1)
|
||||
throw new RuntimeException("Error: read_repair_chance must be between 0 and 1.");
|
||||
|
||||
cfDef.setRead_repair_chance(chance);
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -1232,15 +1232,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
|
|||
}
|
||||
|
||||
IColumnIterator ci = filter.getMemtableColumnIterator(cached, null, getComparator());
|
||||
ColumnFamily cf = null;
|
||||
try
|
||||
{
|
||||
cf = ci.getColumnFamily().cloneMeShallow();
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
throw new IOError(e);
|
||||
}
|
||||
ColumnFamily cf = ci.getColumnFamily().cloneMeShallow();
|
||||
filter.collectCollatedColumns(cf, ci, gcBefore);
|
||||
// TODO this is necessary because when we collate supercolumns together, we don't check
|
||||
// their subcolumns for relevance, so we need to do a second prune post facto here.
|
||||
|
|
@ -1302,10 +1294,6 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
|
|||
// and "there used to be data, but it's gone now" (we should cache the empty CF so we don't need to rebuild that slower)
|
||||
return returnCF;
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
throw new IOError(e);
|
||||
}
|
||||
finally
|
||||
{
|
||||
/* close all cursors */
|
||||
|
|
|
|||
|
|
@ -151,6 +151,14 @@ public class Memtable implements Comparable<Memtable>, IFlushable
|
|||
|
||||
public void updateLiveRatio()
|
||||
{
|
||||
if (!MemoryMeter.isInitialized())
|
||||
{
|
||||
// hack for openjdk. we log a warning about this in the startup script too.
|
||||
logger.warn("MemoryMeter uninitialized (jamm not specified as java agent); assuming liveRatio of 10.0. Usually this means cassandra-env.sh disabled jamm because you are using a buggy JRE; upgrade to the Sun JRE instead");
|
||||
cfs.liveRatio = 10.0;
|
||||
return;
|
||||
}
|
||||
|
||||
Runnable runnable = new Runnable()
|
||||
{
|
||||
public void run()
|
||||
|
|
|
|||
|
|
@ -118,14 +118,7 @@ public class RowIteratorFactory
|
|||
{
|
||||
this.colIters.add(current);
|
||||
this.key = current.getKey();
|
||||
try
|
||||
{
|
||||
this.returnCF.delete(current.getColumnFamily());
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
throw new IOError(e);
|
||||
}
|
||||
this.returnCF.delete(current.getColumnFamily());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -31,14 +31,9 @@ import org.apache.cassandra.db.IColumn;
|
|||
public interface IColumnIterator extends Iterator<IColumn>
|
||||
{
|
||||
/**
|
||||
* returns the CF of the column being iterated.
|
||||
* Do not modify the returned CF; clone first.
|
||||
* This is guaranteed to be non-null and that the returned CF have the correct metadata
|
||||
* (markedForDeleteAt and localDeletionTime). The full CF is however only guaranteed to
|
||||
* be available after a call to next() or hasNext().
|
||||
* @throws IOException
|
||||
* @return An empty CF holding metadata for the row being iterated.
|
||||
*/
|
||||
public abstract ColumnFamily getColumnFamily() throws IOException;
|
||||
public abstract ColumnFamily getColumnFamily();
|
||||
|
||||
/**
|
||||
* @return the current row key
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ public class SSTableSliceIterator implements IColumnIterator
|
|||
return key;
|
||||
}
|
||||
|
||||
public ColumnFamily getColumnFamily() throws IOException
|
||||
public ColumnFamily getColumnFamily()
|
||||
{
|
||||
return reader == null ? null : reader.getColumnFamily();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ class SimpleSliceReader extends AbstractIterator<IColumn> implements IColumnIter
|
|||
return column;
|
||||
}
|
||||
|
||||
public ColumnFamily getColumnFamily() throws IOException
|
||||
public ColumnFamily getColumnFamily()
|
||||
{
|
||||
return emptyColumnFamily;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -815,10 +815,9 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe
|
|||
}
|
||||
|
||||
/**
|
||||
* Handle node leaving the ring. This can be either because of decommission or loadbalance
|
||||
* Handle node leaving the ring. This will happen when a node is decommissioned
|
||||
*
|
||||
* @param endpoint If reason for leaving is decommission or loadbalance
|
||||
* endpoint is the leaving node.
|
||||
* @param endpoint If reason for leaving is decommission, endpoint is the leaving node.
|
||||
* @param pieces STATE_LEFT,token
|
||||
*/
|
||||
private void handleStateLeft(InetAddress endpoint, String[] pieces)
|
||||
|
|
@ -1799,15 +1798,6 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe
|
|||
move(partitioner.getTokenFactory().fromString(newToken));
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates balanced token and calls load balance operation to move current node to that token
|
||||
* @throws IOException on any I/O operation error
|
||||
*/
|
||||
public void loadBalance() throws IOException
|
||||
{
|
||||
move(BootStrapper.getBalancedToken(tokenMetadata_, StorageLoadBalancer.instance.getLoadInfo()));
|
||||
}
|
||||
|
||||
/**
|
||||
* move the node to new token or find a new token to boot to according to load
|
||||
*
|
||||
|
|
|
|||
|
|
@ -197,13 +197,6 @@ public interface StorageServiceMBean
|
|||
*/
|
||||
public void move(String newToken) throws IOException, InterruptedException;
|
||||
|
||||
/**
|
||||
* Node will call BootStrapper.getBalancedToken then it will calculate ranges to
|
||||
* transfer from other nodes, load the data and move to a new token
|
||||
* @throws IOException on any I/O error.
|
||||
*/
|
||||
public void loadBalance() throws IOException;
|
||||
|
||||
/**
|
||||
* removeToken removes token (and all data associated with
|
||||
* enpoint that had it) from the ring
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ public class NodeCmd
|
|||
public enum NodeCommand
|
||||
{
|
||||
RING, INFO, CFSTATS, SNAPSHOT, CLEARSNAPSHOT, VERSION, TPSTATS, FLUSH, DRAIN,
|
||||
DECOMMISSION, MOVE, LOADBALANCE, REMOVETOKEN, REPAIR, CLEANUP, COMPACT, SCRUB,
|
||||
DECOMMISSION, MOVE, REMOVETOKEN, REPAIR, CLEANUP, COMPACT, SCRUB,
|
||||
SETCACHECAPACITY, GETCOMPACTIONTHRESHOLD, SETCOMPACTIONTHRESHOLD, NETSTATS, CFHISTOGRAMS,
|
||||
COMPACTIONSTATS, DISABLEGOSSIP, ENABLEGOSSIP, INVALIDATEKEYCACHE, INVALIDATEROWCACHE,
|
||||
DISABLETHRIFT, ENABLETHRIFT, JOIN, SETCOMPACTIONTHROUGHPUT
|
||||
|
|
@ -100,7 +100,6 @@ public class NodeCmd
|
|||
addCmdHelp(header, "tpstats", "Print usage statistics of thread pools");
|
||||
addCmdHelp(header, "drain", "Drain the node (stop accepting writes and flush all column families)");
|
||||
addCmdHelp(header, "decommission", "Decommission the node");
|
||||
addCmdHelp(header, "loadbalance", "Loadbalance the node");
|
||||
addCmdHelp(header, "compactionstats", "Print statistics on compactions");
|
||||
addCmdHelp(header, "disablegossip", "Disable gossip (effectively marking the node dead)");
|
||||
addCmdHelp(header, "enablegossip", "Reenable gossip");
|
||||
|
|
@ -553,7 +552,6 @@ public class NodeCmd
|
|||
case INFO : nodeCmd.printInfo(System.out); break;
|
||||
case CFSTATS : nodeCmd.printColumnFamilyStats(System.out); break;
|
||||
case DECOMMISSION : probe.decommission(); break;
|
||||
case LOADBALANCE : probe.loadBalance(); break;
|
||||
case TPSTATS : nodeCmd.printThreadPoolStats(System.out); break;
|
||||
case VERSION : nodeCmd.printReleaseVersion(System.out); break;
|
||||
case COMPACTIONSTATS : nodeCmd.printCompactionStats(System.out); break;
|
||||
|
|
|
|||
|
|
@ -354,11 +354,6 @@ public class NodeProbe
|
|||
ssProxy.decommission();
|
||||
}
|
||||
|
||||
public void loadBalance() throws IOException
|
||||
{
|
||||
ssProxy.loadBalance();
|
||||
}
|
||||
|
||||
public void move(String newToken) throws IOException, InterruptedException
|
||||
{
|
||||
ssProxy.move(newToken);
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ public class CountersTest extends TestBase
|
|||
{
|
||||
ByteBuffer bname = ByteBuffer.wrap(name.getBytes());
|
||||
ColumnPath cpath = new ColumnPath(cf).setColumn(bname);
|
||||
CounterColumn col = client.get_counter(key, cpath, cl).column;
|
||||
CounterColumn col = client.get(key, cpath, cl).counter_column;
|
||||
assertEquals(bname, col.name);
|
||||
assertEquals(value.longValue(), col.value);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ import java.util.*;
|
|||
|
||||
import org.apache.cassandra.thrift.*;
|
||||
import org.apache.cassandra.tools.NodeProbe;
|
||||
import org.apache.cassandra.utils.ByteBufferUtil;
|
||||
import org.apache.cassandra.utils.WrappedRunnable;
|
||||
|
||||
import org.apache.cassandra.CassandraServiceController.Failure;
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
|
||||
package org.apache.cassandra;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.InetAddress;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.util.*;
|
||||
|
|
@ -25,7 +26,11 @@ import java.util.*;
|
|||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import org.apache.cassandra.client.RingCache;
|
||||
import org.apache.cassandra.dht.RandomPartitioner;
|
||||
import org.apache.cassandra.service.StorageService;
|
||||
import org.apache.cassandra.thrift.*;
|
||||
import org.apache.cassandra.utils.ByteBufferUtil;
|
||||
import org.apache.cassandra.utils.WrappedRunnable;
|
||||
import org.apache.thrift.TException;
|
||||
|
||||
|
|
|
|||
|
|
@ -82,13 +82,14 @@ public abstract class TestBase
|
|||
{
|
||||
List<InetAddress> hosts = controller.getHosts();
|
||||
Cassandra.Client client = controller.createClient(hosts.get(0));
|
||||
|
||||
Map<String,String> stratOptions = new HashMap<String,String>();
|
||||
stratOptions.put("replication_factor", "" + rf);
|
||||
client.system_add_keyspace(
|
||||
new KsDef(
|
||||
name,
|
||||
"org.apache.cassandra.locator.SimpleStrategy",
|
||||
rf,
|
||||
Arrays.asList(cfdef)));
|
||||
Arrays.asList(cfdef))
|
||||
.setStrategy_options(stratOptions));
|
||||
|
||||
// poll, until KS added
|
||||
for (InetAddress host : hosts)
|
||||
|
|
|
|||
|
|
@ -91,7 +91,6 @@ public class Session
|
|||
|
||||
private int progressInterval = 10;
|
||||
private int keysPerCall = 1000;
|
||||
private int replicationFactor = 1;
|
||||
private boolean replicateOnWrite = true;
|
||||
private boolean ignoreErrors = false;
|
||||
|
||||
|
|
@ -231,7 +230,7 @@ public class Session
|
|||
keysPerCall = Integer.parseInt(cmd.getOptionValue("g"));
|
||||
|
||||
if (cmd.hasOption("l"))
|
||||
replicationFactor = Integer.parseInt(cmd.getOptionValue("l"));
|
||||
replicationStrategyOptions.put("replication_factor", String.valueOf(Integer.parseInt(cmd.getOptionValue("l"))));
|
||||
|
||||
if (cmd.hasOption("e"))
|
||||
consistencyLevel = ConsistencyLevel.valueOf(cmd.getOptionValue("e").toUpperCase());
|
||||
|
|
@ -414,7 +413,6 @@ public class Session
|
|||
|
||||
keyspace.setName("Keyspace1");
|
||||
keyspace.setStrategy_class(replicationStrategy);
|
||||
keyspace.setReplication_factor(replicationFactor);
|
||||
|
||||
if (!replicationStrategyOptions.isEmpty())
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue