git commit: Make incremental repair default
Repository: cassandra
Updated Branches:
refs/heads/trunk a125bb068 - 0c45727c4
Make incremental repair default
Patch by marcuse; reviewed by jbellis for CASSANDRA-7250
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0c45727c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c45727c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0c45727c
Branch: refs/heads/trunk
Commit: 0c45727c4b53693e3a1d2fbc1b538bddacad6a0a
Parents: a125bb0
Author: Marcus Eriksson marc...@apache.org
Authored: Fri May 16 16:24:09 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon May 19 08:47:48 2014 +0200
--
CHANGES.txt | 1 +
src/java/org/apache/cassandra/tools/NodeTool.java | 8
2 files changed, 5 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c45727c/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index e541e7e..c7b2cf2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,7 @@
* Add Thrift get_multi_slice call (CASSANDRA-6757)
* Optimize fetching multiple cells by name (CASSANDRA-6933)
* Allow compilation in java 8 (CASSANDRA-7208)
+ * Make incremental repair default (CASSANDRA-7250)
2.1.0-rc1
* Add PowerShell Windows launch scripts (CASSANDRA-7001)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c45727c/src/java/org/apache/cassandra/tools/NodeTool.java
--
diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java
b/src/java/org/apache/cassandra/tools/NodeTool.java
index 8f2f261..64ebd9e 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -1604,8 +1604,8 @@ public class NodeTool
@Option(title = primary_range, name = {-pr,
--partitioner-range}, description = Use -pr to repair only the first range
returned by the partitioner)
private boolean primaryRange = false;
-@Option(title = incremental_repair, name = {-inc,
--incremental}, description = Use -inc to use the new incremental repair)
-private boolean incrementalRepair = false;
+@Option(title = full, name = {-full, --full}, description = Use
-full to issue a full repair.)
+private boolean fullRepair = false;
@Override
public void execute(NodeProbe probe)
@@ -1626,9 +1626,9 @@ public class NodeTool
else if(!specificHosts.isEmpty())
hosts = newArrayList(specificHosts);
if (!startToken.isEmpty() || !endToken.isEmpty())
-probe.forceRepairRangeAsync(System.out, keyspace,
!parallel, dataCenters,hosts, startToken, endToken, !incrementalRepair);
+probe.forceRepairRangeAsync(System.out, keyspace,
!parallel, dataCenters,hosts, startToken, endToken, fullRepair);
else
-probe.forceRepairAsync(System.out, keyspace,
!parallel, dataCenters, hosts, primaryRange, !incrementalRepair, cfnames);
+probe.forceRepairAsync(System.out, keyspace,
!parallel, dataCenters, hosts, primaryRange, fullRepair, cfnames);
} catch (Exception e)
{
throw new RuntimeException(Error occurred during repair,
e);
[jira] [Commented] (CASSANDRA-6525) Cannot select data which using WHERE
[
https://issues.apache.org/jira/browse/CASSANDRA-6525?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14001471#comment-14001471
]
Sylvain Lebresne commented on CASSANDRA-6525:
-
Patch lgtm, but wouldn't make sense to do also invalidate for truncate in
CFS.truncateBlocking, just to be on the safe side?
Cannot select data which using WHERE
--
Key: CASSANDRA-6525
URL: https://issues.apache.org/jira/browse/CASSANDRA-6525
Project: Cassandra
Issue Type: Bug
Environment: Linux RHEL5
RAM: 1GB
Cassandra 2.0.3
CQL spec 3.1.1
Thrift protocol 19.38.0
Reporter: Silence Chow
Assignee: Tyler Hobbs
Fix For: 2.0.8
Attachments: 6525-2.0.txt, 6981_test.py
I am developing a system on my single machine using VMware Player with 1GB
Ram and 1Gb HHD. When I select all data, I didn't have any problems. But when
I using WHERE and it has just below 10 records. I have got this error in
system log:
{noformat}
ERROR [ReadStage:41] 2013-12-25 18:52:11,913 CassandraDaemon.java (line 187)
Exception in thread Thread[ReadStage:41,5,main]
java.io.IOError: java.io.EOFException
at org.apache.cassandra.db.Column$1.computeNext(Column.java:79)
at org.apache.cassandra.db.Column$1.computeNext(Column.java:64)
at
com.google.common.collect.AbstractIterator.tryToComputeNext(AbstractIterator.java:143)
at
com.google.common.collect.AbstractIterator.hasNext(AbstractIterator.java:138)
at
org.apache.cassandra.db.columniterator.SimpleSliceReader.computeNext(SimpleSliceReader.java:88)
at
org.apache.cassandra.db.columniterator.SimpleSliceReader.computeNext(SimpleSliceReader.java:37)
at
com.google.common.collect.AbstractIterator.tryToComputeNext(AbstractIterator.java:143)
at
com.google.common.collect.AbstractIterator.hasNext(AbstractIterator.java:138)
at
org.apache.cassandra.db.columniterator.SSTableSliceIterator.hasNext(SSTableSliceIterator.java:82)
at
org.apache.cassandra.db.filter.QueryFilter$2.getNext(QueryFilter.java:157)
at
org.apache.cassandra.db.filter.QueryFilter$2.hasNext(QueryFilter.java:140)
at
org.apache.cassandra.utils.MergeIterator$Candidate.advance(MergeIterator.java:144)
at
org.apache.cassandra.utils.MergeIterator$ManyToOne.init(MergeIterator.java:87)
at org.apache.cassandra.utils.MergeIterator.get(MergeIterator.java:46)
at
org.apache.cassandra.db.filter.QueryFilter.collateColumns(QueryFilter.java:120)
at
org.apache.cassandra.db.filter.QueryFilter.collateOnDiskAtom(QueryFilter.java:80)
at
org.apache.cassandra.db.filter.QueryFilter.collateOnDiskAtom(QueryFilter.java:72)
at
org.apache.cassandra.db.CollationController.collectAllData(CollationController.java:297)
at
org.apache.cassandra.db.CollationController.getTopLevelColumns(CollationController.java:53)
at
org.apache.cassandra.db.ColumnFamilyStore.getTopLevelColumns(ColumnFamilyStore.java:1487)
at
org.apache.cassandra.db.ColumnFamilyStore.getColumnFamily(ColumnFamilyStore.java:1306)
at org.apache.cassandra.db.Keyspace.getRow(Keyspace.java:332)
at
org.apache.cassandra.db.SliceFromReadCommand.getRow(SliceFromReadCommand.java:65)
at
org.apache.cassandra.service.StorageProxy$LocalReadRunnable.runMayThrow(StorageProxy.java:1401)
at
org.apache.cassandra.service.StorageProxy$DroppableRunnable.run(StorageProxy.java:1936)
at java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
at java.lang.Thread.run(Unknown Source)
Caused by: java.io.EOFException
at java.io.RandomAccessFile.readFully(Unknown Source)
at java.io.RandomAccessFile.readFully(Unknown Source)
at
org.apache.cassandra.io.util.RandomAccessReader.readBytes(RandomAccessReader.java:348)
at
org.apache.cassandra.utils.ByteBufferUtil.read(ByteBufferUtil.java:392)
at
org.apache.cassandra.utils.ByteBufferUtil.readWithShortLength(ByteBufferUtil.java:371)
at
org.apache.cassandra.db.OnDiskAtom$Serializer.deserializeFromSSTable(OnDiskAtom.java:74)
at org.apache.cassandra.db.Column$1.computeNext(Column.java:75)
... 27 more
{noformat}
E.g.
{{SELECT * FROM table;}}
Its fine.
{{SELECT * FROM table WHERE field = 'N';}}
field is the partition key.
Its said Request did not complete within rpc_timeout. in cqlsh
--
This message was sent by Atlassian JIRA
(v6.2#6252)
[jira] [Commented] (CASSANDRA-7231) Support more concurrent requests per native transport connection
[ https://issues.apache.org/jira/browse/CASSANDRA-7231?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14001480#comment-14001480 ] Sylvain Lebresne commented on CASSANDRA-7231: - You misunderstood me, I didn't said that drivers *should* base support of this on the Cassandra version. This is a protocol v3 feature and it's only documented in the v3 spec. All I said is that because this happen to be backward compatible I didn't bothered to reject request from the v1/v2 protocol if they end up using this. If we're freaked out that some v1/v2 driver will use this by mistake and get extra confused, I'm absolutely fine adding a protocol version check and throw a ProtocolException. But having it a flag means drivers that want to implement the v3 protocol don't have to support this right away, they can do it in their own time, which is a nice property to have. Support more concurrent requests per native transport connection Key: CASSANDRA-7231 URL: https://issues.apache.org/jira/browse/CASSANDRA-7231 Project: Cassandra Issue Type: Improvement Components: Core Reporter: Benedict Assignee: Sylvain Lebresne Priority: Minor Fix For: 2.1.0 Attachments: 7231.txt Right now we only support 127 concurrent requests against a given native transport connection. This causes us to waste file handles opening multiple connections, increases driver complexity and dilutes writes across multiple connections so that batching cannot easily be performed. I propose raising this limit substantially, to somewhere in the region of 16-64K, and that this is a good time to do it since we're already bumping the protocol version. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Created] (CASSANDRA-7263) Improve the layout of the output of compactionstats
Nicolas Lalevée created CASSANDRA-7263: -- Summary: Improve the layout of the output of compactionstats Key: CASSANDRA-7263 URL: https://issues.apache.org/jira/browse/CASSANDRA-7263 Project: Cassandra Issue Type: Improvement Components: Tools Reporter: Nicolas Lalevée Priority: Trivial Attachments: compactionstats-layout.patch If the name of the column family of the keyspace, the layout of the output is messed up. Hence the suggested patch which compute the size the columns so they can be printed properly. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-7263) Improve the layout of the output of compactionstats
[ https://issues.apache.org/jira/browse/CASSANDRA-7263?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nicolas Lalevée updated CASSANDRA-7263: --- Description: If the name of the column family or the keyspace is too long, the layout of the output is messed up. Hence the suggested patch which computes the size the columns so they can be printed properly. (was: If the name of the column family of the keyspace, the layout of the output is messed up. Hence the suggested patch which compute the size the columns so they can be printed properly.) Improve the layout of the output of compactionstats --- Key: CASSANDRA-7263 URL: https://issues.apache.org/jira/browse/CASSANDRA-7263 Project: Cassandra Issue Type: Improvement Components: Tools Reporter: Nicolas Lalevée Priority: Trivial Attachments: compactionstats-layout.patch If the name of the column family or the keyspace is too long, the layout of the output is messed up. Hence the suggested patch which computes the size the columns so they can be printed properly. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-7263) Improve the layout of the output of compactionstats
[ https://issues.apache.org/jira/browse/CASSANDRA-7263?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nicolas Lalevée updated CASSANDRA-7263: --- Attachment: compactionstats-layout.patch Improve the layout of the output of compactionstats --- Key: CASSANDRA-7263 URL: https://issues.apache.org/jira/browse/CASSANDRA-7263 Project: Cassandra Issue Type: Improvement Components: Tools Reporter: Nicolas Lalevée Priority: Trivial Attachments: compactionstats-layout.patch If the name of the column family of the keyspace, the layout of the output is messed up. Hence the suggested patch which compute the size the columns so they can be printed properly. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7248) Tuple type
[
https://issues.apache.org/jira/browse/CASSANDRA-7248?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14001502#comment-14001502
]
Sylvain Lebresne commented on CASSANDRA-7248:
-
bq. I'm a little hesitant to expose a new type just because we can.
It's not because we can. It's because we *have to* expose it if we do
CASSANDRA-6875. That is, if we do CASSANDRA-6875, we will have TupleType, it
will be part of the native protocol and it will be a type visible to users
since they that will be a type of bind variables. To take the Java driver as
example, this imply that we will need to have a 'tuple type' in
[DataType|https://github.com/datastax/java-driver/blob/2.0/driver-core/src/main/java/com/datastax/driver/core/DataType.java]
and will need to introduce a new tuple class for tuple values so user can
pass them for CASSANDRA-6875. All of this even if we don't expose tuple as
column types and all of this is user facing. So adding TupleType for
CASSANDRA-6875 without adding it as a column type would 1) don't really save
any effort neither C* side nor driver side and 2) ends up with a type that does
exist and user can see, but can't use themselves, which imo is a *lot* more
confusing/frustrating for users.
As for use cases, they are basically the same than UDT, except that when you
have only 2-3 fields to group together (in a collection for instance), it might
sometimes be cleaner/simpler/preferred to have a tuple than to declare a new
UDT. This is definitively just a convenience, but that's what UDT are too in
the first place, a convenience, and that's what CQL is about too. Also since we
use the same serialization format, we can also allow user to switch from tuple
to UDT, so they may want to start with a tuple initially during the prototyping
phase and later move to a true UDT when they end up adding more fields. And
since tuples are a pretty familiar concept, I doubt having that choice will
throw users off.
Don't get me wrong, we can decide to not do CASSANDRA-6875, in which case I
won't insist on this (even though I do think it's nice to have in any case).
But having tuples only half supported is imo the worst choice of all.
Tuple type
--
Key: CASSANDRA-7248
URL: https://issues.apache.org/jira/browse/CASSANDRA-7248
Project: Cassandra
Issue Type: Bug
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
Labels: cql3
Fix For: 2.1 rc1
For CASSANDRA-6875 we need to be able to talk about tuples values and types
(for prepared variables). Since we need it there, clients will need to
support them anyway and so I think it would be a lot cleaner to start
supporting those more generally. Besides, having tuples is a relatively
simple and natural extension to what we have. I'll note in particular that
tuple have a close relationship to user type in the sense that a tuple will
be really just like an anonymous with no name for the fields and in
particular a tuple value will be the same than a user type value.
The syntax would simply look like that:
{noformat}
CREATE TABLE foo (
k int PRIMARY KEY,
v tupleint, text, float
)
INSERT INTO foo(k, v) VALUES(0, (3, 'bar', 2.1));
{noformat}
We can also add projections in selects if we want:
{noformat}
SELECT v[0], v[2] FROM foo WHERE k = 0;
{noformat}
but that can come later (after all, we still don't have projections for
collections and it's not a big deal).
--
This message was sent by Atlassian JIRA
(v6.2#6252)
[jira] [Commented] (CASSANDRA-7248) Tuple type
[
https://issues.apache.org/jira/browse/CASSANDRA-7248?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14001504#comment-14001504
]
Sylvain Lebresne commented on CASSANDRA-7248:
-
PS: pretty sure this is not a clone of CASSANDRA-7248.
Tuple type
--
Key: CASSANDRA-7248
URL: https://issues.apache.org/jira/browse/CASSANDRA-7248
Project: Cassandra
Issue Type: Bug
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
Labels: cql3
Fix For: 2.1 rc1
For CASSANDRA-6875 we need to be able to talk about tuples values and types
(for prepared variables). Since we need it there, clients will need to
support them anyway and so I think it would be a lot cleaner to start
supporting those more generally. Besides, having tuples is a relatively
simple and natural extension to what we have. I'll note in particular that
tuple have a close relationship to user type in the sense that a tuple will
be really just like an anonymous with no name for the fields and in
particular a tuple value will be the same than a user type value.
The syntax would simply look like that:
{noformat}
CREATE TABLE foo (
k int PRIMARY KEY,
v tupleint, text, float
)
INSERT INTO foo(k, v) VALUES(0, (3, 'bar', 2.1));
{noformat}
We can also add projections in selects if we want:
{noformat}
SELECT v[0], v[2] FROM foo WHERE k = 0;
{noformat}
but that can come later (after all, we still don't have projections for
collections and it's not a big deal).
--
This message was sent by Atlassian JIRA
(v6.2#6252)
[jira] [Commented] (CASSANDRA-7216) Restricted superuser account request
[ https://issues.apache.org/jira/browse/CASSANDRA-7216?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14001523#comment-14001523 ] Oded Peer commented on CASSANDRA-7216: -- [~iamaleksey] For my case keyspaces and users are related. I tried your suggestion, using a custom IAuthenticator to grant permissions upon user creation. I granted CREATE and ALTER on the root resource so the new user will be able to create the tenant keyspace, and I granted CREATE through MODIFY on the tenant's keyspace. Even though all the users can create tables in every keyspace only a single user can query the tables, this seems reasonable from security perspective. Restricted superuser account request Key: CASSANDRA-7216 URL: https://issues.apache.org/jira/browse/CASSANDRA-7216 Project: Cassandra Issue Type: Improvement Reporter: Oded Peer Assignee: Dave Brosius Priority: Minor Fix For: 3.0 Attachments: 7216.txt I am developing a multi-tenant service. Every tenant has its own user, keyspace and can access only his keyspace. As new tenants are provisioned there is a need to create new users and keyspaces. Only a superuser can issue CREATE USER requests, so we must have a super user account in the system. On the other hand super users have access to all the keyspaces, which poses a security risk. For tenant provisioning I would like to have a restricted account which can only create new users, without read access to keyspaces. -- This message was sent by Atlassian JIRA (v6.2#6252)
[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
src/java/org/apache/cassandra/cql3/ColumnCondition.java
src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java
src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
src/java/org/apache/cassandra/cql3/statements/Selection.java
src/java/org/apache/cassandra/db/marshal/CollectionType.java
src/java/org/apache/cassandra/db/marshal/DynamicCompositeType.java
src/java/org/apache/cassandra/db/marshal/ListType.java
src/java/org/apache/cassandra/db/marshal/MapType.java
src/java/org/apache/cassandra/db/marshal/SetType.java
src/java/org/apache/cassandra/serializers/CollectionSerializer.java
src/java/org/apache/cassandra/serializers/ListSerializer.java
src/java/org/apache/cassandra/serializers/MapSerializer.java
src/java/org/apache/cassandra/serializers/SetSerializer.java
test/unit/org/apache/cassandra/db/marshal/CollectionTypeTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/33bd8c20
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33bd8c20
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/33bd8c20
Branch: refs/heads/trunk
Commit: 33bd8c207a2b59990019c2cbfcbeceb9b6f8456e
Parents: 07dc6b5 9d06ea6
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon May 19 12:26:32 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon May 19 12:26:32 2014 +0200
--
.../apache/cassandra/cql3/ColumnCondition.java | 277 +--
src/java/org/apache/cassandra/cql3/Lists.java | 13 +
src/java/org/apache/cassandra/cql3/Maps.java| 20 ++
src/java/org/apache/cassandra/cql3/Sets.java| 15 +
.../cql3/statements/CQL3CasConditions.java | 10 +-
.../cql3/statements/ModificationStatement.java | 4 +-
.../cql3/statements/SelectStatement.java| 16 +-
.../cassandra/cql3/statements/Selection.java| 39 +--
8 files changed, 272 insertions(+), 122 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/33bd8c20/src/java/org/apache/cassandra/cql3/ColumnCondition.java
--
diff --cc src/java/org/apache/cassandra/cql3/ColumnCondition.java
index c2617fe,adc8e3a..ed2b6b4
--- a/src/java/org/apache/cassandra/cql3/ColumnCondition.java
+++ b/src/java/org/apache/cassandra/cql3/ColumnCondition.java
@@@ -74,122 -73,209 +75,196 @@@ public class ColumnConditio
value.collectMarkerSpecification(boundNames);
}
- public ColumnCondition.WithOptions with(QueryOptions options)
-public ColumnCondition.Bound bind(ListByteBuffer variables) throws
InvalidRequestException
++public ColumnCondition.Bound bind(QueryOptions options) throws
InvalidRequestException
{
- return new WithOptions(options);
+ return column.type instanceof CollectionType
- ? (collectionElement == null ? new CollectionBound(this,
variables) : new ElementAccessBound(this, variables))
- : new SimpleBound(this, variables);
++ ? (collectionElement == null ? new CollectionBound(this,
options) : new ElementAccessBound(this, options))
++ : new SimpleBound(this, options);
}
- public class WithOptions
+ public static abstract class Bound
{
- private final QueryOptions options;
-public final CFDefinition.Name column;
++public final ColumnDefinition column;
- private WithOptions(QueryOptions options)
-protected Bound(CFDefinition.Name column)
++protected Bound(ColumnDefinition column)
{
- this.options = options;
+ this.column = column;
}
- public boolean equalsTo(WithOptions other) throws
InvalidRequestException
+ /**
+ * Validates whether this condition applies to {@code current}.
+ */
-public abstract boolean appliesTo(ColumnNameBuilder rowPrefix,
ColumnFamily current, long now) throws InvalidRequestException;
++public abstract boolean appliesTo(Composite rowPrefix, ColumnFamily
current, long now) throws InvalidRequestException;
+
+ public ByteBuffer getCollectionElementValue()
{
- if (!column().equals(other.column()))
- return false;
+ return null;
+ }
- if ((collectionElement() == null) != (other.collectionElement()
== null))
- return false;
-protected ColumnNameBuilder copyOrUpdatePrefix(CFMetaData cfm,
ColumnNameBuilder rowPrefix)
-{
-
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/308f2c0f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/308f2c0f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/308f2c0f Branch: refs/heads/trunk Commit: 308f2c0fcaf4956ffb4ff0795fc15e03bdf743ee Parents: 0c45727 33bd8c2 Author: Sylvain Lebresne sylv...@datastax.com Authored: Mon May 19 12:26:49 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Mon May 19 12:26:49 2014 +0200 -- .../apache/cassandra/cql3/ColumnCondition.java | 277 +-- src/java/org/apache/cassandra/cql3/Lists.java | 13 + src/java/org/apache/cassandra/cql3/Maps.java| 20 ++ src/java/org/apache/cassandra/cql3/Sets.java| 15 + .../cql3/statements/CQL3CasConditions.java | 10 +- .../cql3/statements/ModificationStatement.java | 4 +- .../cql3/statements/SelectStatement.java| 16 +- .../cassandra/cql3/statements/Selection.java| 39 +-- 8 files changed, 272 insertions(+), 122 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/308f2c0f/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
src/java/org/apache/cassandra/cql3/ColumnCondition.java
src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java
src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
src/java/org/apache/cassandra/cql3/statements/Selection.java
src/java/org/apache/cassandra/db/marshal/CollectionType.java
src/java/org/apache/cassandra/db/marshal/DynamicCompositeType.java
src/java/org/apache/cassandra/db/marshal/ListType.java
src/java/org/apache/cassandra/db/marshal/MapType.java
src/java/org/apache/cassandra/db/marshal/SetType.java
src/java/org/apache/cassandra/serializers/CollectionSerializer.java
src/java/org/apache/cassandra/serializers/ListSerializer.java
src/java/org/apache/cassandra/serializers/MapSerializer.java
src/java/org/apache/cassandra/serializers/SetSerializer.java
test/unit/org/apache/cassandra/db/marshal/CollectionTypeTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/33bd8c20
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33bd8c20
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/33bd8c20
Branch: refs/heads/cassandra-2.1
Commit: 33bd8c207a2b59990019c2cbfcbeceb9b6f8456e
Parents: 07dc6b5 9d06ea6
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon May 19 12:26:32 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon May 19 12:26:32 2014 +0200
--
.../apache/cassandra/cql3/ColumnCondition.java | 277 +--
src/java/org/apache/cassandra/cql3/Lists.java | 13 +
src/java/org/apache/cassandra/cql3/Maps.java| 20 ++
src/java/org/apache/cassandra/cql3/Sets.java| 15 +
.../cql3/statements/CQL3CasConditions.java | 10 +-
.../cql3/statements/ModificationStatement.java | 4 +-
.../cql3/statements/SelectStatement.java| 16 +-
.../cassandra/cql3/statements/Selection.java| 39 +--
8 files changed, 272 insertions(+), 122 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/33bd8c20/src/java/org/apache/cassandra/cql3/ColumnCondition.java
--
diff --cc src/java/org/apache/cassandra/cql3/ColumnCondition.java
index c2617fe,adc8e3a..ed2b6b4
--- a/src/java/org/apache/cassandra/cql3/ColumnCondition.java
+++ b/src/java/org/apache/cassandra/cql3/ColumnCondition.java
@@@ -74,122 -73,209 +75,196 @@@ public class ColumnConditio
value.collectMarkerSpecification(boundNames);
}
- public ColumnCondition.WithOptions with(QueryOptions options)
-public ColumnCondition.Bound bind(ListByteBuffer variables) throws
InvalidRequestException
++public ColumnCondition.Bound bind(QueryOptions options) throws
InvalidRequestException
{
- return new WithOptions(options);
+ return column.type instanceof CollectionType
- ? (collectionElement == null ? new CollectionBound(this,
variables) : new ElementAccessBound(this, variables))
- : new SimpleBound(this, variables);
++ ? (collectionElement == null ? new CollectionBound(this,
options) : new ElementAccessBound(this, options))
++ : new SimpleBound(this, options);
}
- public class WithOptions
+ public static abstract class Bound
{
- private final QueryOptions options;
-public final CFDefinition.Name column;
++public final ColumnDefinition column;
- private WithOptions(QueryOptions options)
-protected Bound(CFDefinition.Name column)
++protected Bound(ColumnDefinition column)
{
- this.options = options;
+ this.column = column;
}
- public boolean equalsTo(WithOptions other) throws
InvalidRequestException
+ /**
+ * Validates whether this condition applies to {@code current}.
+ */
-public abstract boolean appliesTo(ColumnNameBuilder rowPrefix,
ColumnFamily current, long now) throws InvalidRequestException;
++public abstract boolean appliesTo(Composite rowPrefix, ColumnFamily
current, long now) throws InvalidRequestException;
+
+ public ByteBuffer getCollectionElementValue()
{
- if (!column().equals(other.column()))
- return false;
+ return null;
+ }
- if ((collectionElement() == null) != (other.collectionElement()
== null))
- return false;
-protected ColumnNameBuilder copyOrUpdatePrefix(CFMetaData cfm,
ColumnNameBuilder rowPrefix)
-{
-
git commit: Validate method for CollectionType
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 33bd8c207 - 590b3b23a
Validate method for CollectionType
patch by slebresne; reviewed by thobbs for CASSANDRA-7208
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/590b3b23
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/590b3b23
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/590b3b23
Branch: refs/heads/cassandra-2.1
Commit: 590b3b23ac2db333048c52c5323b78d0630605ae
Parents: 33bd8c2
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon May 19 12:28:49 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon May 19 12:28:49 2014 +0200
--
CHANGES.txt | 1 +
.../cassandra/db/marshal/CollectionType.java| 5 --
.../serializers/CollectionSerializer.java | 12 +--
.../cassandra/serializers/ListSerializer.java | 15
.../cassandra/serializers/MapSerializer.java| 18
.../cassandra/serializers/SetSerializer.java| 15
.../db/marshal/CollectionTypeTest.java | 93
7 files changed, 149 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/590b3b23/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 3a9eb2b..4efaa46 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -15,6 +15,7 @@
* Make batchlog replay asynchronous (CASSANDRA-6134)
* remove unused classes (CASSANDRA-7197)
* Limit user types to the keyspace they are defined in (CASSANDRA-6643)
+ * Add validate method to CollectionType (CASSANDRA-7208)
Merged from 2.0:
* (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221)
* (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/590b3b23/src/java/org/apache/cassandra/db/marshal/CollectionType.java
--
diff --git a/src/java/org/apache/cassandra/db/marshal/CollectionType.java
b/src/java/org/apache/cassandra/db/marshal/CollectionType.java
index 7f75a5f..b1d8da1 100644
--- a/src/java/org/apache/cassandra/db/marshal/CollectionType.java
+++ b/src/java/org/apache/cassandra/db/marshal/CollectionType.java
@@ -85,11 +85,6 @@ public abstract class CollectionTypeT extends
AbstractTypeT
}
}
-public void validate(ByteBuffer bytes)
-{
-valueComparator().validate(bytes);
-}
-
@Override
public boolean isCompatibleWith(AbstractType? previous)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/590b3b23/src/java/org/apache/cassandra/serializers/CollectionSerializer.java
--
diff --git
a/src/java/org/apache/cassandra/serializers/CollectionSerializer.java
b/src/java/org/apache/cassandra/serializers/CollectionSerializer.java
index 5452a96..7cddb12 100644
--- a/src/java/org/apache/cassandra/serializers/CollectionSerializer.java
+++ b/src/java/org/apache/cassandra/serializers/CollectionSerializer.java
@@ -25,15 +25,11 @@ import org.apache.cassandra.utils.ByteBufferUtil;
public abstract class CollectionSerializerT implements TypeSerializerT
{
-public void validate(ByteBuffer bytes) throws MarshalException
-{
-// The collection is not currently being properly validated.
-}
-
protected abstract ListByteBuffer serializeValues(T value);
protected abstract int getElementCount(T value);
public abstract T deserializeForNativeProtocol(ByteBuffer buffer, int
version);
+public abstract void validateForNativeProtocol(ByteBuffer buffer, int
version);
public ByteBuffer serialize(T value)
{
@@ -52,6 +48,12 @@ public abstract class CollectionSerializerT implements
TypeSerializerT
return deserializeForNativeProtocol(bytes, 3);
}
+public void validate(ByteBuffer bytes) throws MarshalException
+{
+// Same thing than above
+validateForNativeProtocol(bytes, 3);
+}
+
public static ByteBuffer pack(ListByteBuffer buffers, int elements, int
version)
{
int size = 0;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/590b3b23/src/java/org/apache/cassandra/serializers/ListSerializer.java
--
diff --git a/src/java/org/apache/cassandra/serializers/ListSerializer.java
b/src/java/org/apache/cassandra/serializers/ListSerializer.java
index e662341..b64c012 100644
--- a/src/java/org/apache/cassandra/serializers/ListSerializer.java
+++ b/src/java/org/apache/cassandra/serializers/ListSerializer.java
@@ -60,6 +60,21 @@ public class ListSerializerT extends
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b530133 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b530133 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b530133 Branch: refs/heads/trunk Commit: 5b53013322e47729121dc03716aa35ccc7aca1f4 Parents: 308f2c0 590b3b2 Author: Sylvain Lebresne sylv...@datastax.com Authored: Mon May 19 12:30:26 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Mon May 19 12:30:26 2014 +0200 -- CHANGES.txt | 1 + .../cassandra/db/marshal/CollectionType.java| 5 -- .../serializers/CollectionSerializer.java | 12 +-- .../cassandra/serializers/ListSerializer.java | 15 .../cassandra/serializers/MapSerializer.java| 18 .../cassandra/serializers/SetSerializer.java| 15 .../db/marshal/CollectionTypeTest.java | 93 7 files changed, 149 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b530133/CHANGES.txt --
[1/2] git commit: Validate method for CollectionType
Repository: cassandra
Updated Branches:
refs/heads/trunk 308f2c0fc - 5b5301332
Validate method for CollectionType
patch by slebresne; reviewed by thobbs for CASSANDRA-7208
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/590b3b23
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/590b3b23
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/590b3b23
Branch: refs/heads/trunk
Commit: 590b3b23ac2db333048c52c5323b78d0630605ae
Parents: 33bd8c2
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon May 19 12:28:49 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon May 19 12:28:49 2014 +0200
--
CHANGES.txt | 1 +
.../cassandra/db/marshal/CollectionType.java| 5 --
.../serializers/CollectionSerializer.java | 12 +--
.../cassandra/serializers/ListSerializer.java | 15
.../cassandra/serializers/MapSerializer.java| 18
.../cassandra/serializers/SetSerializer.java| 15
.../db/marshal/CollectionTypeTest.java | 93
7 files changed, 149 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/590b3b23/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 3a9eb2b..4efaa46 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -15,6 +15,7 @@
* Make batchlog replay asynchronous (CASSANDRA-6134)
* remove unused classes (CASSANDRA-7197)
* Limit user types to the keyspace they are defined in (CASSANDRA-6643)
+ * Add validate method to CollectionType (CASSANDRA-7208)
Merged from 2.0:
* (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221)
* (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/590b3b23/src/java/org/apache/cassandra/db/marshal/CollectionType.java
--
diff --git a/src/java/org/apache/cassandra/db/marshal/CollectionType.java
b/src/java/org/apache/cassandra/db/marshal/CollectionType.java
index 7f75a5f..b1d8da1 100644
--- a/src/java/org/apache/cassandra/db/marshal/CollectionType.java
+++ b/src/java/org/apache/cassandra/db/marshal/CollectionType.java
@@ -85,11 +85,6 @@ public abstract class CollectionTypeT extends
AbstractTypeT
}
}
-public void validate(ByteBuffer bytes)
-{
-valueComparator().validate(bytes);
-}
-
@Override
public boolean isCompatibleWith(AbstractType? previous)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/590b3b23/src/java/org/apache/cassandra/serializers/CollectionSerializer.java
--
diff --git
a/src/java/org/apache/cassandra/serializers/CollectionSerializer.java
b/src/java/org/apache/cassandra/serializers/CollectionSerializer.java
index 5452a96..7cddb12 100644
--- a/src/java/org/apache/cassandra/serializers/CollectionSerializer.java
+++ b/src/java/org/apache/cassandra/serializers/CollectionSerializer.java
@@ -25,15 +25,11 @@ import org.apache.cassandra.utils.ByteBufferUtil;
public abstract class CollectionSerializerT implements TypeSerializerT
{
-public void validate(ByteBuffer bytes) throws MarshalException
-{
-// The collection is not currently being properly validated.
-}
-
protected abstract ListByteBuffer serializeValues(T value);
protected abstract int getElementCount(T value);
public abstract T deserializeForNativeProtocol(ByteBuffer buffer, int
version);
+public abstract void validateForNativeProtocol(ByteBuffer buffer, int
version);
public ByteBuffer serialize(T value)
{
@@ -52,6 +48,12 @@ public abstract class CollectionSerializerT implements
TypeSerializerT
return deserializeForNativeProtocol(bytes, 3);
}
+public void validate(ByteBuffer bytes) throws MarshalException
+{
+// Same thing than above
+validateForNativeProtocol(bytes, 3);
+}
+
public static ByteBuffer pack(ListByteBuffer buffers, int elements, int
version)
{
int size = 0;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/590b3b23/src/java/org/apache/cassandra/serializers/ListSerializer.java
--
diff --git a/src/java/org/apache/cassandra/serializers/ListSerializer.java
b/src/java/org/apache/cassandra/serializers/ListSerializer.java
index e662341..b64c012 100644
--- a/src/java/org/apache/cassandra/serializers/ListSerializer.java
+++ b/src/java/org/apache/cassandra/serializers/ListSerializer.java
@@ -60,6 +60,21 @@ public class ListSerializerT extends
CollectionSerializerListT
git commit: Changelog fix
Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 9d06ea6f1 - 86632a133 Changelog fix Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/86632a13 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/86632a13 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/86632a13 Branch: refs/heads/cassandra-2.0 Commit: 86632a1339f9539c30504a90d133b94364708a40 Parents: 9d06ea6 Author: Sylvain Lebresne sylv...@datastax.com Authored: Mon May 19 12:32:15 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Mon May 19 12:32:15 2014 +0200 -- CHANGES.txt | 36 +--- 1 file changed, 17 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/86632a13/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 4f84af1..5c9b436 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,22 +1,3 @@ -2.0.9 - * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221) - * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228) - * Fix potential SlabAllocator yield-starvation (CASSANDRA-7133) - * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067) - * Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177) - * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183) - * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162) - * Fix disabling autocompaction (CASSANDRA-7187) - * Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088) - * cqlsh can't tab-complete disabling compaction (CASSANDRA-7185) - * cqlsh: Accept and execute CQL statement(s) from command-line parameter (CASSANDRA-7172) - * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198) - * Fix the InvertedIndex trigger example (CASSANDRA-7211) - * Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210) - * Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818) - * reduce garbage on codec flag deserialization (CASSANDRA-7244) - - 2.0.8 * Correctly delete scheduled range xfers (CASSANDRA-7143) * Make batchlog replica selection rack-aware (CASSANDRA-6551) @@ -33,6 +14,23 @@ * Re-add parameter columns to tracing session (CASSANDRA-6942) * Fix writetime/ttl functions for static columns (CASSANDRA-7081) * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142) + * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221) + * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228) + * Fix potential SlabAllocator yield-starvation (CASSANDRA-7133) + * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067) + * Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177) + * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183) + * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162) + * Fix disabling autocompaction (CASSANDRA-7187) + * Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088) + * cqlsh can't tab-complete disabling compaction (CASSANDRA-7185) + * cqlsh: Accept and execute CQL statement(s) from command-line parameter (CASSANDRA-7172) + * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198) + * Fix the InvertedIndex trigger example (CASSANDRA-7211) + * Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210) + * Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818) + * reduce garbage on codec flag deserialization (CASSANDRA-7244) + * Proper null handle for IF with map element access (CASSANDRA-7155) Merged from 1.2: * Add Cloudstack snitch (CASSANDRA-7147) * Update system.peers correctly when relocating tokens (CASSANDRA-7126)
[2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66a3da0e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66a3da0e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66a3da0e Branch: refs/heads/cassandra-2.1 Commit: 66a3da0e2fed7fd87f3af7bf73d821bcc21fad7a Parents: 590b3b2 86632a1 Author: Sylvain Lebresne sylv...@datastax.com Authored: Mon May 19 12:33:06 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Mon May 19 12:33:06 2014 +0200 -- CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/66a3da0e/CHANGES.txt -- diff --cc CHANGES.txt index 4efaa46,5c9b436..eda9fd8 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -35,7 -28,9 +35,9 @@@ Merged from 2.0 * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198) * Fix the InvertedIndex trigger example (CASSANDRA-7211) * Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210) - * Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818) * reduce garbage on codec flag deserialization (CASSANDRA-7244) ++ * Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818) + * Proper null handle for IF with map element access (CASSANDRA-7155) Merged from 1.2: * Add Cloudstack snitch (CASSANDRA-7147) * Update system.peers correctly when relocating tokens (CASSANDRA-7126)
[1/2] git commit: Changelog fix
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 590b3b23a - 66a3da0e2 Changelog fix Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/86632a13 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/86632a13 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/86632a13 Branch: refs/heads/cassandra-2.1 Commit: 86632a1339f9539c30504a90d133b94364708a40 Parents: 9d06ea6 Author: Sylvain Lebresne sylv...@datastax.com Authored: Mon May 19 12:32:15 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Mon May 19 12:32:15 2014 +0200 -- CHANGES.txt | 36 +--- 1 file changed, 17 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/86632a13/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 4f84af1..5c9b436 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,22 +1,3 @@ -2.0.9 - * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221) - * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228) - * Fix potential SlabAllocator yield-starvation (CASSANDRA-7133) - * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067) - * Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177) - * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183) - * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162) - * Fix disabling autocompaction (CASSANDRA-7187) - * Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088) - * cqlsh can't tab-complete disabling compaction (CASSANDRA-7185) - * cqlsh: Accept and execute CQL statement(s) from command-line parameter (CASSANDRA-7172) - * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198) - * Fix the InvertedIndex trigger example (CASSANDRA-7211) - * Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210) - * Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818) - * reduce garbage on codec flag deserialization (CASSANDRA-7244) - - 2.0.8 * Correctly delete scheduled range xfers (CASSANDRA-7143) * Make batchlog replica selection rack-aware (CASSANDRA-6551) @@ -33,6 +14,23 @@ * Re-add parameter columns to tracing session (CASSANDRA-6942) * Fix writetime/ttl functions for static columns (CASSANDRA-7081) * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142) + * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221) + * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228) + * Fix potential SlabAllocator yield-starvation (CASSANDRA-7133) + * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067) + * Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177) + * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183) + * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162) + * Fix disabling autocompaction (CASSANDRA-7187) + * Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088) + * cqlsh can't tab-complete disabling compaction (CASSANDRA-7185) + * cqlsh: Accept and execute CQL statement(s) from command-line parameter (CASSANDRA-7172) + * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198) + * Fix the InvertedIndex trigger example (CASSANDRA-7211) + * Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210) + * Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818) + * reduce garbage on codec flag deserialization (CASSANDRA-7244) + * Proper null handle for IF with map element access (CASSANDRA-7155) Merged from 1.2: * Add Cloudstack snitch (CASSANDRA-7147) * Update system.peers correctly when relocating tokens (CASSANDRA-7126)
[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66a3da0e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66a3da0e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66a3da0e Branch: refs/heads/trunk Commit: 66a3da0e2fed7fd87f3af7bf73d821bcc21fad7a Parents: 590b3b2 86632a1 Author: Sylvain Lebresne sylv...@datastax.com Authored: Mon May 19 12:33:06 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Mon May 19 12:33:06 2014 +0200 -- CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/66a3da0e/CHANGES.txt -- diff --cc CHANGES.txt index 4efaa46,5c9b436..eda9fd8 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -35,7 -28,9 +35,9 @@@ Merged from 2.0 * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198) * Fix the InvertedIndex trigger example (CASSANDRA-7211) * Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210) - * Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818) * reduce garbage on codec flag deserialization (CASSANDRA-7244) ++ * Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818) + * Proper null handle for IF with map element access (CASSANDRA-7155) Merged from 1.2: * Add Cloudstack snitch (CASSANDRA-7147) * Update system.peers correctly when relocating tokens (CASSANDRA-7126)
[1/3] git commit: Changelog fix
Repository: cassandra Updated Branches: refs/heads/trunk 5b5301332 - 2a6aaca62 Changelog fix Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/86632a13 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/86632a13 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/86632a13 Branch: refs/heads/trunk Commit: 86632a1339f9539c30504a90d133b94364708a40 Parents: 9d06ea6 Author: Sylvain Lebresne sylv...@datastax.com Authored: Mon May 19 12:32:15 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Mon May 19 12:32:15 2014 +0200 -- CHANGES.txt | 36 +--- 1 file changed, 17 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/86632a13/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 4f84af1..5c9b436 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,22 +1,3 @@ -2.0.9 - * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221) - * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228) - * Fix potential SlabAllocator yield-starvation (CASSANDRA-7133) - * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067) - * Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177) - * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183) - * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162) - * Fix disabling autocompaction (CASSANDRA-7187) - * Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088) - * cqlsh can't tab-complete disabling compaction (CASSANDRA-7185) - * cqlsh: Accept and execute CQL statement(s) from command-line parameter (CASSANDRA-7172) - * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198) - * Fix the InvertedIndex trigger example (CASSANDRA-7211) - * Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210) - * Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818) - * reduce garbage on codec flag deserialization (CASSANDRA-7244) - - 2.0.8 * Correctly delete scheduled range xfers (CASSANDRA-7143) * Make batchlog replica selection rack-aware (CASSANDRA-6551) @@ -33,6 +14,23 @@ * Re-add parameter columns to tracing session (CASSANDRA-6942) * Fix writetime/ttl functions for static columns (CASSANDRA-7081) * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142) + * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221) + * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228) + * Fix potential SlabAllocator yield-starvation (CASSANDRA-7133) + * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067) + * Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177) + * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183) + * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162) + * Fix disabling autocompaction (CASSANDRA-7187) + * Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088) + * cqlsh can't tab-complete disabling compaction (CASSANDRA-7185) + * cqlsh: Accept and execute CQL statement(s) from command-line parameter (CASSANDRA-7172) + * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198) + * Fix the InvertedIndex trigger example (CASSANDRA-7211) + * Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210) + * Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818) + * reduce garbage on codec flag deserialization (CASSANDRA-7244) + * Proper null handle for IF with map element access (CASSANDRA-7155) Merged from 1.2: * Add Cloudstack snitch (CASSANDRA-7147) * Update system.peers correctly when relocating tokens (CASSANDRA-7126)
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2a6aaca6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a6aaca6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a6aaca6 Branch: refs/heads/trunk Commit: 2a6aaca6244fb33024574b14ce89734347696d1d Parents: 5b53013 66a3da0 Author: Sylvain Lebresne sylv...@datastax.com Authored: Mon May 19 12:33:21 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Mon May 19 12:33:21 2014 +0200 -- CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a6aaca6/CHANGES.txt --
buildbot success in ASF Buildbot on cassandra-2.0
The Buildbot has detected a restored build on builder cassandra-2.0 while building cassandra. Full details are available at: http://ci.apache.org/builders/cassandra-2.0/builds/14 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: portunus_ubuntu Build Reason: scheduler Build Source Stamp: [branch cassandra-2.0] 86632a1339f9539c30504a90d133b94364708a40 Blamelist: Sylvain Lebresne sylv...@datastax.com Build succeeded! sincerely, -The Buildbot
[Cassandra Wiki] Update of HadoopSupport by jeremyhanna
Dear Wiki user, You have subscribed to a wiki page or wiki category on Cassandra Wiki for change notification. The HadoopSupport page has been changed by jeremyhanna: https://wiki.apache.org/cassandra/HadoopSupport?action=diffrev1=57rev2=58 Comment: Updating and clarifying some of the troubleshooting information. == Troubleshooting == If you are running into timeout exceptions, you might need to tweak one or both of these settings: - * '''cassandra.range.batch.size''' - the default is 4096, but you may need to lower this depending on your data. This is either specified in your hadoop configuration or using `org.apache.cassandra.hadoop.ConfigHelper.setRangeBatchSize`. - * '''rpc_timeout_in_ms''' - this is set in your `cassandra.yaml`. The rpc timeout is not for timing out from the client but between nodes. This can be increased to reduce chances of timing out. + * Each input split is divided into sequential batches of rows requested at a time from Cassandra. This is the '''cassandra.range.batch.size''' property and it defaults to 4096. If you are experiencing timeouts, you might first try to reduce the batch size so that it can more easily complete the request within the timeout. This is either specified in your hadoop configuration or using `org.apache.cassandra.hadoop.ConfigHelper.setRangeBatchSize`. + * Starting in Cassandra 1.2, there is range request specific timeout called '''range_request_timeout_in_ms''' in the cassandra.yaml. Hadoop will request data in sequential batches and the request has to complete within this timeout. Prior to Cassandra 1.2, you're can set the general '''rpc_timeout_in_ms''' higher, which affects timeouts for reads, writes, and truncate operations in addition to range requests. If you still see timeout exceptions with resultant failed jobs and/or blacklisted tasktrackers, there are settings that can give Cassandra more latitude before failing the jobs. An example of usage (in either the job configuration or tasktracker mapred-site.xml):
[jira] [Commented] (CASSANDRA-7216) Restricted superuser account request
[ https://issues.apache.org/jira/browse/CASSANDRA-7216?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14001608#comment-14001608 ] Oded Peer commented on CASSANDRA-7216: -- [~dbrosius] If the user-admin role can grant any permission to any user what prevents the attacker from creating a new user and granting permissions to read existing keyspaces? Restricted superuser account request Key: CASSANDRA-7216 URL: https://issues.apache.org/jira/browse/CASSANDRA-7216 Project: Cassandra Issue Type: Improvement Reporter: Oded Peer Assignee: Dave Brosius Priority: Minor Fix For: 3.0 Attachments: 7216.txt I am developing a multi-tenant service. Every tenant has its own user, keyspace and can access only his keyspace. As new tenants are provisioned there is a need to create new users and keyspaces. Only a superuser can issue CREATE USER requests, so we must have a super user account in the system. On the other hand super users have access to all the keyspaces, which poses a security risk. For tenant provisioning I would like to have a restricted account which can only create new users, without read access to keyspaces. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7216) Restricted superuser account request
[ https://issues.apache.org/jira/browse/CASSANDRA-7216?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14001606#comment-14001606 ] Aleksey Yeschenko commented on CASSANDRA-7216: -- [~odpeer] Or you could go further. Pre-create the keyspace in the authenticator itself, and then grant all you need just on the keyspace itself, so that the top-level resource won't have to be involved. Because as it is right now, users will be able to create tables in every other keyspace as well. Restricted superuser account request Key: CASSANDRA-7216 URL: https://issues.apache.org/jira/browse/CASSANDRA-7216 Project: Cassandra Issue Type: Improvement Reporter: Oded Peer Assignee: Dave Brosius Priority: Minor Fix For: 3.0 Attachments: 7216.txt I am developing a multi-tenant service. Every tenant has its own user, keyspace and can access only his keyspace. As new tenants are provisioned there is a need to create new users and keyspaces. Only a superuser can issue CREATE USER requests, so we must have a super user account in the system. On the other hand super users have access to all the keyspaces, which poses a security risk. For tenant provisioning I would like to have a restricted account which can only create new users, without read access to keyspaces. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-4718) More-efficient ExecutorService for improved throughput
[ https://issues.apache.org/jira/browse/CASSANDRA-4718?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14001621#comment-14001621 ] Jonathan Ellis commented on CASSANDRA-4718: --- bq. I can patch stress briefly to force it to run all thread counts in the requested range, instead of stopping when it hits a plateau That sounds like a good option to have. bq. when we did May 15 (which is completely different test btw, addressing your point from previous comment) there was almost no disk activity after original page cache warm up That doesn't sound right to me, all the number from May 15 are 7k-14k ops/s which is disk bound territory. More-efficient ExecutorService for improved throughput -- Key: CASSANDRA-4718 URL: https://issues.apache.org/jira/browse/CASSANDRA-4718 Project: Cassandra Issue Type: Improvement Reporter: Jonathan Ellis Assignee: Benedict Priority: Minor Labels: performance Fix For: 2.1.0 Attachments: 4718-v1.patch, PerThreadQueue.java, austin_diskbound_read.svg, aws.svg, aws_read.svg, backpressure-stress.out.txt, baq vs trunk.png, belliotsmith_branches-stress.out.txt, jason_read.svg, jason_read_latency.svg, jason_run1.svg, jason_run2.svg, jason_run3.svg, jason_write.svg, op costs of various queues.ods, stress op rate with various queues.ods, stress_2014May15.txt, stress_2014May16.txt, v1-stress.out Currently all our execution stages dequeue tasks one at a time. This can result in contention between producers and consumers (although we do our best to minimize this by using LinkedBlockingQueue). One approach to mitigating this would be to make consumer threads do more work in bulk instead of just one task per dequeue. (Producer threads tend to be single-task oriented by nature, so I don't see an equivalent opportunity there.) BlockingQueue has a drainTo(collection, int) method that would be perfect for this. However, no ExecutorService in the jdk supports using drainTo, nor could I google one. What I would like to do here is create just such a beast and wire it into (at least) the write and read stages. (Other possible candidates for such an optimization, such as the CommitLog and OutboundTCPConnection, are not ExecutorService-based and will need to be one-offs.) AbstractExecutorService may be useful. The implementations of ICommitLogExecutorService may also be useful. (Despite the name these are not actual ExecutorServices, although they share the most important properties of one.) -- This message was sent by Atlassian JIRA (v6.2#6252)
[Cassandra Wiki] Trivial Update of HadoopSupport by jeremyhanna
Dear Wiki user, You have subscribed to a wiki page or wiki category on Cassandra Wiki for change notification. The HadoopSupport page has been changed by jeremyhanna: https://wiki.apache.org/cassandra/HadoopSupport?action=diffrev1=58rev2=59 If you are running into timeout exceptions, you might need to tweak one or both of these settings: * Each input split is divided into sequential batches of rows requested at a time from Cassandra. This is the '''cassandra.range.batch.size''' property and it defaults to 4096. If you are experiencing timeouts, you might first try to reduce the batch size so that it can more easily complete the request within the timeout. This is either specified in your hadoop configuration or using `org.apache.cassandra.hadoop.ConfigHelper.setRangeBatchSize`. - * Starting in Cassandra 1.2, there is range request specific timeout called '''range_request_timeout_in_ms''' in the cassandra.yaml. Hadoop will request data in sequential batches and the request has to complete within this timeout. Prior to Cassandra 1.2, you're can set the general '''rpc_timeout_in_ms''' higher, which affects timeouts for reads, writes, and truncate operations in addition to range requests. + * Starting in Cassandra 1.2, there is range request specific timeout called '''range_request_timeout_in_ms''' in the cassandra.yaml. Hadoop requests data in sequential batches and each request has to complete within this timeout. Prior to Cassandra 1.2, you're can set the general '''rpc_timeout_in_ms''' higher, which affects timeouts for reads, writes, and truncate operations in addition to range requests. If you still see timeout exceptions with resultant failed jobs and/or blacklisted tasktrackers, there are settings that can give Cassandra more latitude before failing the jobs. An example of usage (in either the job configuration or tasktracker mapred-site.xml):
git commit: Increase compaction visibility
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 86632a133 - e3a88b9f8
Increase compaction visibility
Patch by cnlwsu; reviewed by marcuse for CASSANDRA-7242.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e3a88b9f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e3a88b9f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e3a88b9f
Branch: refs/heads/cassandra-2.0
Commit: e3a88b9f80ea9ba59cf3da8f7b5cc81ccb32e24a
Parents: 86632a1
Author: Marcus Eriksson marc...@apache.org
Authored: Mon May 19 14:29:15 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon May 19 14:30:35 2014 +0200
--
CHANGES.txt | 1 +
.../apache/cassandra/db/compaction/CompactionManager.java | 6 +++---
.../org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 9 +
3 files changed, 13 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3a88b9f/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 5c9b436..ed818db 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -31,6 +31,7 @@
* Fix duplicated error messages on directory creation error at startup
(CASSANDRA-5818)
* reduce garbage on codec flag deserialization (CASSANDRA-7244)
* Proper null handle for IF with map element access (CASSANDRA-7155)
+ * Improve compaction visibility (CASSANDRA-7242)
Merged from 1.2:
* Add Cloudstack snitch (CASSANDRA-7147)
* Update system.peers correctly when relocating tokens (CASSANDRA-7126)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3a88b9f/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 31b7d8e..2708e4c 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -35,6 +35,7 @@ import org.slf4j.LoggerFactory;
import org.apache.cassandra.cache.AutoSavingCache;
import org.apache.cassandra.concurrent.DebuggableThreadPoolExecutor;
+import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutor;
import org.apache.cassandra.concurrent.NamedThreadFactory;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.DatabaseDescriptor;
@@ -927,12 +928,11 @@ public class CompactionManager implements
CompactionManagerMBean
return CompactionMetrics.getCompactions().size();
}
-private static class CompactionExecutor extends ThreadPoolExecutor
+private static class CompactionExecutor extends
JMXEnabledThreadPoolExecutor
{
protected CompactionExecutor(int minThreads, int maxThreads, String
name, BlockingQueueRunnable queue)
{
-super(minThreads, maxThreads, 60, TimeUnit.SECONDS, queue, new
NamedThreadFactory(name, Thread.MIN_PRIORITY));
-allowCoreThreadTimeOut(true);
+super(minThreads, maxThreads, 60, TimeUnit.SECONDS, queue, new
NamedThreadFactory(name, Thread.MIN_PRIORITY), internal);
}
private CompactionExecutor(int threadCount, String name)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3a88b9f/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
--
diff --git a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
index bcff2d0..8880485 100644
--- a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
@@ -56,6 +56,8 @@ public class ColumnFamilyMetrics
public final LatencyMetrics writeLatency;
/** Estimated number of tasks pending for this column family */
public final GaugeInteger pendingTasks;
+/** Estimate of number of pending compactios for this CF */
+public final GaugeInteger pendingCompactions;
/** Number of SSTables on disk for this CF */
public final GaugeInteger liveSSTableCount;
/** Disk space used by SSTables belonging to this CF */
@@ -175,6 +177,13 @@ public class ColumnFamilyMetrics
});
readLatency = new LatencyMetrics(factory, Read);
writeLatency = new LatencyMetrics(factory, Write);
+pendingCompactions =
Metrics.newGauge(factory.createMetricName(PendingCompactions), new
GaugeInteger()
+{
+public Integer value()
+{
+return
[2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/518c3cf6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/518c3cf6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/518c3cf6
Branch: refs/heads/cassandra-2.1
Commit: 518c3cf61679654545d7dd07fd6ca8efd8428389
Parents: 66a3da0 e3a88b9
Author: Marcus Eriksson marc...@apache.org
Authored: Mon May 19 14:32:54 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon May 19 14:32:54 2014 +0200
--
CHANGES.txt | 1 +
.../apache/cassandra/db/compaction/CompactionManager.java | 6 +++---
.../org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 9 +
3 files changed, 13 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/518c3cf6/CHANGES.txt
--
diff --cc CHANGES.txt
index eda9fd8,ed818db..860e8e2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -35,9 -28,10 +35,10 @@@ Merged from 2.0
* Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198)
* Fix the InvertedIndex trigger example (CASSANDRA-7211)
* Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210)
- * Fix duplicated error messages on directory creation error at startup
(CASSANDRA-5818)
* reduce garbage on codec flag deserialization (CASSANDRA-7244)
+ * Fix duplicated error messages on directory creation error at startup
(CASSANDRA-5818)
* Proper null handle for IF with map element access (CASSANDRA-7155)
+ * Improve compaction visibility (CASSANDRA-7242)
Merged from 1.2:
* Add Cloudstack snitch (CASSANDRA-7147)
* Update system.peers correctly when relocating tokens (CASSANDRA-7126)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/518c3cf6/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/518c3cf6/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
--
diff --cc src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
index efbf60e,8880485..f080fd0
--- a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
@@@ -62,7 -55,9 +62,9 @@@ public class ColumnFamilyMetric
/** (Local) write metrics */
public final LatencyMetrics writeLatency;
/** Estimated number of tasks pending for this column family */
-public final GaugeInteger pendingTasks;
+public final Counter pendingFlushes;
+ /** Estimate of number of pending compactios for this CF */
+ public final GaugeInteger pendingCompactions;
/** Number of SSTables on disk for this CF */
public final GaugeInteger liveSSTableCount;
/** Disk space used by SSTables belonging to this CF */
@@@ -231,7 -177,21 +233,14 @@@
});
readLatency = new LatencyMetrics(factory, Read);
writeLatency = new LatencyMetrics(factory, Write);
+pendingFlushes =
Metrics.newCounter(factory.createMetricName(PendingFlushes));
+ pendingCompactions =
Metrics.newGauge(factory.createMetricName(PendingCompactions), new
GaugeInteger()
+ {
+ public Integer value()
+ {
+ return
cfs.getCompactionStrategy().getEstimatedRemainingTasks();
+ }
+ });
-pendingTasks =
Metrics.newGauge(factory.createMetricName(PendingTasks), new GaugeInteger()
-{
-public Integer value()
-{
-// TODO this actually isn't a good measure of pending tasks
-return Keyspace.switchLock.getQueueLength();
-}
-});
liveSSTableCount =
Metrics.newGauge(factory.createMetricName(LiveSSTableCount), new
GaugeInteger()
{
public Integer value()
[1/2] git commit: Increase compaction visibility
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 66a3da0e2 - 518c3cf61
Increase compaction visibility
Patch by cnlwsu; reviewed by marcuse for CASSANDRA-7242.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e3a88b9f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e3a88b9f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e3a88b9f
Branch: refs/heads/cassandra-2.1
Commit: e3a88b9f80ea9ba59cf3da8f7b5cc81ccb32e24a
Parents: 86632a1
Author: Marcus Eriksson marc...@apache.org
Authored: Mon May 19 14:29:15 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon May 19 14:30:35 2014 +0200
--
CHANGES.txt | 1 +
.../apache/cassandra/db/compaction/CompactionManager.java | 6 +++---
.../org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 9 +
3 files changed, 13 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3a88b9f/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 5c9b436..ed818db 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -31,6 +31,7 @@
* Fix duplicated error messages on directory creation error at startup
(CASSANDRA-5818)
* reduce garbage on codec flag deserialization (CASSANDRA-7244)
* Proper null handle for IF with map element access (CASSANDRA-7155)
+ * Improve compaction visibility (CASSANDRA-7242)
Merged from 1.2:
* Add Cloudstack snitch (CASSANDRA-7147)
* Update system.peers correctly when relocating tokens (CASSANDRA-7126)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3a88b9f/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 31b7d8e..2708e4c 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -35,6 +35,7 @@ import org.slf4j.LoggerFactory;
import org.apache.cassandra.cache.AutoSavingCache;
import org.apache.cassandra.concurrent.DebuggableThreadPoolExecutor;
+import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutor;
import org.apache.cassandra.concurrent.NamedThreadFactory;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.DatabaseDescriptor;
@@ -927,12 +928,11 @@ public class CompactionManager implements
CompactionManagerMBean
return CompactionMetrics.getCompactions().size();
}
-private static class CompactionExecutor extends ThreadPoolExecutor
+private static class CompactionExecutor extends
JMXEnabledThreadPoolExecutor
{
protected CompactionExecutor(int minThreads, int maxThreads, String
name, BlockingQueueRunnable queue)
{
-super(minThreads, maxThreads, 60, TimeUnit.SECONDS, queue, new
NamedThreadFactory(name, Thread.MIN_PRIORITY));
-allowCoreThreadTimeOut(true);
+super(minThreads, maxThreads, 60, TimeUnit.SECONDS, queue, new
NamedThreadFactory(name, Thread.MIN_PRIORITY), internal);
}
private CompactionExecutor(int threadCount, String name)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3a88b9f/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
--
diff --git a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
index bcff2d0..8880485 100644
--- a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
@@ -56,6 +56,8 @@ public class ColumnFamilyMetrics
public final LatencyMetrics writeLatency;
/** Estimated number of tasks pending for this column family */
public final GaugeInteger pendingTasks;
+/** Estimate of number of pending compactios for this CF */
+public final GaugeInteger pendingCompactions;
/** Number of SSTables on disk for this CF */
public final GaugeInteger liveSSTableCount;
/** Disk space used by SSTables belonging to this CF */
@@ -175,6 +177,13 @@ public class ColumnFamilyMetrics
});
readLatency = new LatencyMetrics(factory, Read);
writeLatency = new LatencyMetrics(factory, Write);
+pendingCompactions =
Metrics.newGauge(factory.createMetricName(PendingCompactions), new
GaugeInteger()
+{
+public Integer value()
+{
+return
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e05caaa8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e05caaa8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e05caaa8 Branch: refs/heads/trunk Commit: e05caaa8cbec3ecd99bb7fc6ab12139e129cf225 Parents: 2a6aaca 518c3cf Author: Marcus Eriksson marc...@apache.org Authored: Mon May 19 14:33:54 2014 +0200 Committer: Marcus Eriksson marc...@apache.org Committed: Mon May 19 14:33:54 2014 +0200 -- CHANGES.txt | 1 + .../apache/cassandra/db/compaction/CompactionManager.java | 6 +++--- .../org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 9 + 3 files changed, 13 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e05caaa8/CHANGES.txt --
[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/518c3cf6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/518c3cf6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/518c3cf6
Branch: refs/heads/trunk
Commit: 518c3cf61679654545d7dd07fd6ca8efd8428389
Parents: 66a3da0 e3a88b9
Author: Marcus Eriksson marc...@apache.org
Authored: Mon May 19 14:32:54 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon May 19 14:32:54 2014 +0200
--
CHANGES.txt | 1 +
.../apache/cassandra/db/compaction/CompactionManager.java | 6 +++---
.../org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 9 +
3 files changed, 13 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/518c3cf6/CHANGES.txt
--
diff --cc CHANGES.txt
index eda9fd8,ed818db..860e8e2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -35,9 -28,10 +35,10 @@@ Merged from 2.0
* Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198)
* Fix the InvertedIndex trigger example (CASSANDRA-7211)
* Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210)
- * Fix duplicated error messages on directory creation error at startup
(CASSANDRA-5818)
* reduce garbage on codec flag deserialization (CASSANDRA-7244)
+ * Fix duplicated error messages on directory creation error at startup
(CASSANDRA-5818)
* Proper null handle for IF with map element access (CASSANDRA-7155)
+ * Improve compaction visibility (CASSANDRA-7242)
Merged from 1.2:
* Add Cloudstack snitch (CASSANDRA-7147)
* Update system.peers correctly when relocating tokens (CASSANDRA-7126)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/518c3cf6/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/518c3cf6/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
--
diff --cc src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
index efbf60e,8880485..f080fd0
--- a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
@@@ -62,7 -55,9 +62,9 @@@ public class ColumnFamilyMetric
/** (Local) write metrics */
public final LatencyMetrics writeLatency;
/** Estimated number of tasks pending for this column family */
-public final GaugeInteger pendingTasks;
+public final Counter pendingFlushes;
+ /** Estimate of number of pending compactios for this CF */
+ public final GaugeInteger pendingCompactions;
/** Number of SSTables on disk for this CF */
public final GaugeInteger liveSSTableCount;
/** Disk space used by SSTables belonging to this CF */
@@@ -231,7 -177,21 +233,14 @@@
});
readLatency = new LatencyMetrics(factory, Read);
writeLatency = new LatencyMetrics(factory, Write);
+pendingFlushes =
Metrics.newCounter(factory.createMetricName(PendingFlushes));
+ pendingCompactions =
Metrics.newGauge(factory.createMetricName(PendingCompactions), new
GaugeInteger()
+ {
+ public Integer value()
+ {
+ return
cfs.getCompactionStrategy().getEstimatedRemainingTasks();
+ }
+ });
-pendingTasks =
Metrics.newGauge(factory.createMetricName(PendingTasks), new GaugeInteger()
-{
-public Integer value()
-{
-// TODO this actually isn't a good measure of pending tasks
-return Keyspace.switchLock.getQueueLength();
-}
-});
liveSSTableCount =
Metrics.newGauge(factory.createMetricName(LiveSSTableCount), new
GaugeInteger()
{
public Integer value()
[1/3] git commit: Increase compaction visibility
Repository: cassandra
Updated Branches:
refs/heads/trunk 2a6aaca62 - e05caaa8c
Increase compaction visibility
Patch by cnlwsu; reviewed by marcuse for CASSANDRA-7242.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e3a88b9f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e3a88b9f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e3a88b9f
Branch: refs/heads/trunk
Commit: e3a88b9f80ea9ba59cf3da8f7b5cc81ccb32e24a
Parents: 86632a1
Author: Marcus Eriksson marc...@apache.org
Authored: Mon May 19 14:29:15 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon May 19 14:30:35 2014 +0200
--
CHANGES.txt | 1 +
.../apache/cassandra/db/compaction/CompactionManager.java | 6 +++---
.../org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 9 +
3 files changed, 13 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3a88b9f/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 5c9b436..ed818db 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -31,6 +31,7 @@
* Fix duplicated error messages on directory creation error at startup
(CASSANDRA-5818)
* reduce garbage on codec flag deserialization (CASSANDRA-7244)
* Proper null handle for IF with map element access (CASSANDRA-7155)
+ * Improve compaction visibility (CASSANDRA-7242)
Merged from 1.2:
* Add Cloudstack snitch (CASSANDRA-7147)
* Update system.peers correctly when relocating tokens (CASSANDRA-7126)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3a88b9f/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 31b7d8e..2708e4c 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -35,6 +35,7 @@ import org.slf4j.LoggerFactory;
import org.apache.cassandra.cache.AutoSavingCache;
import org.apache.cassandra.concurrent.DebuggableThreadPoolExecutor;
+import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutor;
import org.apache.cassandra.concurrent.NamedThreadFactory;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.DatabaseDescriptor;
@@ -927,12 +928,11 @@ public class CompactionManager implements
CompactionManagerMBean
return CompactionMetrics.getCompactions().size();
}
-private static class CompactionExecutor extends ThreadPoolExecutor
+private static class CompactionExecutor extends
JMXEnabledThreadPoolExecutor
{
protected CompactionExecutor(int minThreads, int maxThreads, String
name, BlockingQueueRunnable queue)
{
-super(minThreads, maxThreads, 60, TimeUnit.SECONDS, queue, new
NamedThreadFactory(name, Thread.MIN_PRIORITY));
-allowCoreThreadTimeOut(true);
+super(minThreads, maxThreads, 60, TimeUnit.SECONDS, queue, new
NamedThreadFactory(name, Thread.MIN_PRIORITY), internal);
}
private CompactionExecutor(int threadCount, String name)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3a88b9f/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
--
diff --git a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
index bcff2d0..8880485 100644
--- a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
@@ -56,6 +56,8 @@ public class ColumnFamilyMetrics
public final LatencyMetrics writeLatency;
/** Estimated number of tasks pending for this column family */
public final GaugeInteger pendingTasks;
+/** Estimate of number of pending compactios for this CF */
+public final GaugeInteger pendingCompactions;
/** Number of SSTables on disk for this CF */
public final GaugeInteger liveSSTableCount;
/** Disk space used by SSTables belonging to this CF */
@@ -175,6 +177,13 @@ public class ColumnFamilyMetrics
});
readLatency = new LatencyMetrics(factory, Read);
writeLatency = new LatencyMetrics(factory, Write);
+pendingCompactions =
Metrics.newGauge(factory.createMetricName(PendingCompactions), new
GaugeInteger()
+{
+public Integer value()
+{
+return
[Cassandra Wiki] Update of HadoopSupport by jeremyhanna
Dear Wiki user,
You have subscribed to a wiki page or wiki category on Cassandra Wiki for
change notification.
The HadoopSupport page has been changed by jeremyhanna:
https://wiki.apache.org/cassandra/HadoopSupport?action=diffrev1=59rev2=60
Comment:
noting new consistency level default
}}}
The settings normally default to 4 each, but some find that too conservative.
If you set it too low, you might have blacklisted tasktrackers and failed jobs
because of occasional timeout exceptions. If you set them too high, jobs that
would otherwise fail quickly take a long time to fail, sacrificing efficiency.
Keep in mind that this can just cover a problem. It may be that you always
want these settings to be higher when operating against Cassandra. However, if
you run into these exceptions too frequently, there may be a problem with your
Cassandra or Hadoop configuration.
+ If you are seeing inconsistent data coming back, consider the consistency
level at which you read ('''cassandra.consistencylevel.read''') and write
('''cassandra.consistencylevel.write'''). Both properties default to
!ConsistencyLevel.LOCAL_ONE (Previously
[[https://issues.apache.org/jira/browse/CASSANDRA-6214|ONE]]).
- If you are seeing inconsistent data coming back, consider the consistency
level that you are reading and writing at. The two relevant properties are:
-
- * '''cassandra.consistencylevel.read''' - defaults to !ConsistencyLevel.ONE.
- * '''cassandra.consistencylevel.write''' - defaults to !ConsistencyLevel.ONE.
Also hadoop integration uses range scans underneath which do not do read
repair. However reading at !ConsistencyLevel.QUORUM will reconcile differences
among nodes read. See ReadRepair section as well as the !ConsistencyLevel
section of the [[http://wiki.apache.org/cassandra/API|API]] page for more
details.
[Cassandra Wiki] Trivial Update of HadoopSupport by jeremyhanna
Dear Wiki user, You have subscribed to a wiki page or wiki category on Cassandra Wiki for change notification. The HadoopSupport page has been changed by jeremyhanna: https://wiki.apache.org/cassandra/HadoopSupport?action=diffrev1=60rev2=61 Comment: Updated where the examples are currently located Anchor(Support) == Support == - Sometimes configuration and integration can get tricky. To get support for this functionality, start with the `contrib` examples in the source download of Cassandra. Make sure you are following instructions in the `README` file for that example. You can search the Cassandra user mailing list or post on there as it is very active. You can also ask in the #Cassandra irc channel on freenode for help. Other channels that might be of use are #hadoop, #hadoop-pig, and #hive. Those projects' mailing lists are also very active. + Sometimes configuration and integration can get tricky. To get support for this functionality, start with the `examples` directory in the source download of Cassandra. Make sure you are following instructions in the `README` file for that example. You can search the Cassandra user mailing list or post on there as it is very active. You can also ask in the #Cassandra irc channel on freenode for help. Other channels that might be of use are #hadoop, #hadoop-pig, and #hive. Those projects' mailing lists are also very active. There are professional support options for Cassandra that can help you get everything working together. For more information, see ThirdPartySupport. There are also professional support options specifically for Hadoop. For more information on that, see Hadoop's third party support [[http://wiki.apache.org/hadoop/Support|wiki page]].
buildbot failure in ASF Buildbot on cassandra-2.0
The Buildbot has detected a new failure on builder cassandra-2.0 while building cassandra. Full details are available at: http://ci.apache.org/builders/cassandra-2.0/builds/15 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: portunus_ubuntu Build Reason: scheduler Build Source Stamp: [branch cassandra-2.0] e3a88b9f80ea9ba59cf3da8f7b5cc81ccb32e24a Blamelist: Marcus Eriksson marc...@apache.org BUILD FAILED: failed shell sincerely, -The Buildbot
git commit: Provide the correct QueryOptions when buildind CAS resultset
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 518c3cf61 - 51583ad3d
Provide the correct QueryOptions when buildind CAS resultset
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/51583ad3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51583ad3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51583ad3
Branch: refs/heads/cassandra-2.1
Commit: 51583ad3dc2fab9ba9e667b6ca73d3773642ce05
Parents: 518c3cf
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon May 19 15:45:20 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon May 19 15:45:30 2014 +0200
--
.../cassandra/cql3/statements/BatchStatement.java | 2 +-
.../cql3/statements/ModificationStatement.java| 14 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/51583ad3/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
--
diff --git a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
b/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
index e1266cb..05d37da 100644
--- a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
@@ -308,7 +308,7 @@ public class BatchStatement implements CQLStatement,
MeasurableForPreparedCache
verifyBatchSize(Collections.singleton(updates));
ColumnFamily result = StorageProxy.cas(ksName, cfName, key,
conditions, updates, options.getSerialConsistency(), options.getConsistency());
-return new
ResultMessage.Rows(ModificationStatement.buildCasResultSet(ksName, key, cfName,
result, columnsWithConditions, true));
+return new
ResultMessage.Rows(ModificationStatement.buildCasResultSet(ksName, key, cfName,
result, columnsWithConditions, true, options.forStatement(0)));
}
public ResultMessage executeInternal(QueryState queryState) throws
RequestValidationException, RequestExecutionException
http://git-wip-us.apache.org/repos/asf/cassandra/blob/51583ad3/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
--
diff --git
a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
index 03d4264..e1468fb 100644
--- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
@@ -518,7 +518,7 @@ public abstract class ModificationStatement implements
CQLStatement, MeasurableF
updates,
options.getSerialConsistency(),
options.getConsistency());
-return new ResultMessage.Rows(buildCasResultSet(key, result));
+return new ResultMessage.Rows(buildCasResultSet(key, result, options));
}
public void addUpdatesAndConditions(ByteBuffer key, Composite
clusteringPrefix, ColumnFamily updates, CQL3CasConditions conditions,
QueryOptions options, long now)
@@ -547,12 +547,12 @@ public abstract class ModificationStatement implements
CQLStatement, MeasurableF
}
}
-private ResultSet buildCasResultSet(ByteBuffer key, ColumnFamily cf)
throws InvalidRequestException
+private ResultSet buildCasResultSet(ByteBuffer key, ColumnFamily cf,
QueryOptions options) throws InvalidRequestException
{
-return buildCasResultSet(keyspace(), key, columnFamily(), cf,
getColumnsWithConditions(), false);
+return buildCasResultSet(keyspace(), key, columnFamily(), cf,
getColumnsWithConditions(), false, options);
}
-public static ResultSet buildCasResultSet(String ksName, ByteBuffer key,
String cfName, ColumnFamily cf, IterableColumnDefinition
columnsWithConditions, boolean isBatch)
+public static ResultSet buildCasResultSet(String ksName, ByteBuffer key,
String cfName, ColumnFamily cf, IterableColumnDefinition
columnsWithConditions, boolean isBatch, QueryOptions options)
throws InvalidRequestException
{
boolean success = cf == null;
@@ -562,7 +562,7 @@ public abstract class ModificationStatement implements
CQLStatement, MeasurableF
ListListByteBuffer rows =
Collections.singletonList(Collections.singletonList(BooleanType.instance.decompose(success)));
ResultSet rs = new ResultSet(metadata, rows);
-return success ? rs : merge(rs, buildCasFailureResultSet(key, cf,
columnsWithConditions, isBatch));
+return
[1/2] git commit: Provide the correct QueryOptions when buildind CAS resultset
Repository: cassandra
Updated Branches:
refs/heads/trunk e05caaa8c - 8c2d938ef
Provide the correct QueryOptions when buildind CAS resultset
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/51583ad3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51583ad3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51583ad3
Branch: refs/heads/trunk
Commit: 51583ad3dc2fab9ba9e667b6ca73d3773642ce05
Parents: 518c3cf
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon May 19 15:45:20 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon May 19 15:45:30 2014 +0200
--
.../cassandra/cql3/statements/BatchStatement.java | 2 +-
.../cql3/statements/ModificationStatement.java| 14 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/51583ad3/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
--
diff --git a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
b/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
index e1266cb..05d37da 100644
--- a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
@@ -308,7 +308,7 @@ public class BatchStatement implements CQLStatement,
MeasurableForPreparedCache
verifyBatchSize(Collections.singleton(updates));
ColumnFamily result = StorageProxy.cas(ksName, cfName, key,
conditions, updates, options.getSerialConsistency(), options.getConsistency());
-return new
ResultMessage.Rows(ModificationStatement.buildCasResultSet(ksName, key, cfName,
result, columnsWithConditions, true));
+return new
ResultMessage.Rows(ModificationStatement.buildCasResultSet(ksName, key, cfName,
result, columnsWithConditions, true, options.forStatement(0)));
}
public ResultMessage executeInternal(QueryState queryState) throws
RequestValidationException, RequestExecutionException
http://git-wip-us.apache.org/repos/asf/cassandra/blob/51583ad3/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
--
diff --git
a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
index 03d4264..e1468fb 100644
--- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
@@ -518,7 +518,7 @@ public abstract class ModificationStatement implements
CQLStatement, MeasurableF
updates,
options.getSerialConsistency(),
options.getConsistency());
-return new ResultMessage.Rows(buildCasResultSet(key, result));
+return new ResultMessage.Rows(buildCasResultSet(key, result, options));
}
public void addUpdatesAndConditions(ByteBuffer key, Composite
clusteringPrefix, ColumnFamily updates, CQL3CasConditions conditions,
QueryOptions options, long now)
@@ -547,12 +547,12 @@ public abstract class ModificationStatement implements
CQLStatement, MeasurableF
}
}
-private ResultSet buildCasResultSet(ByteBuffer key, ColumnFamily cf)
throws InvalidRequestException
+private ResultSet buildCasResultSet(ByteBuffer key, ColumnFamily cf,
QueryOptions options) throws InvalidRequestException
{
-return buildCasResultSet(keyspace(), key, columnFamily(), cf,
getColumnsWithConditions(), false);
+return buildCasResultSet(keyspace(), key, columnFamily(), cf,
getColumnsWithConditions(), false, options);
}
-public static ResultSet buildCasResultSet(String ksName, ByteBuffer key,
String cfName, ColumnFamily cf, IterableColumnDefinition
columnsWithConditions, boolean isBatch)
+public static ResultSet buildCasResultSet(String ksName, ByteBuffer key,
String cfName, ColumnFamily cf, IterableColumnDefinition
columnsWithConditions, boolean isBatch, QueryOptions options)
throws InvalidRequestException
{
boolean success = cf == null;
@@ -562,7 +562,7 @@ public abstract class ModificationStatement implements
CQLStatement, MeasurableF
ListListByteBuffer rows =
Collections.singletonList(Collections.singletonList(BooleanType.instance.decompose(success)));
ResultSet rs = new ResultSet(metadata, rows);
-return success ? rs : merge(rs, buildCasFailureResultSet(key, cf,
columnsWithConditions, isBatch));
+return success ? rs :
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8c2d938e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8c2d938e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8c2d938e Branch: refs/heads/trunk Commit: 8c2d938efd4fb24503a06bc5fdefe77e10543f68 Parents: e05caaa 51583ad Author: Sylvain Lebresne sylv...@datastax.com Authored: Mon May 19 15:52:24 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Mon May 19 15:52:24 2014 +0200 -- .../cassandra/cql3/statements/BatchStatement.java | 2 +- .../cql3/statements/ModificationStatement.java| 14 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) --
[jira] [Commented] (CASSANDRA-7248) Tuple type
[
https://issues.apache.org/jira/browse/CASSANDRA-7248?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14001719#comment-14001719
]
Brandon Williams commented on CASSANDRA-7248:
-
bq. PS: pretty sure this is not a clone of CASSANDRA-7248.
Well, this is CASSANDRA-7248, so I agree.
Tuple type
--
Key: CASSANDRA-7248
URL: https://issues.apache.org/jira/browse/CASSANDRA-7248
Project: Cassandra
Issue Type: Bug
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
Labels: cql3
Fix For: 2.1 rc1
For CASSANDRA-6875 we need to be able to talk about tuples values and types
(for prepared variables). Since we need it there, clients will need to
support them anyway and so I think it would be a lot cleaner to start
supporting those more generally. Besides, having tuples is a relatively
simple and natural extension to what we have. I'll note in particular that
tuple have a close relationship to user type in the sense that a tuple will
be really just like an anonymous with no name for the fields and in
particular a tuple value will be the same than a user type value.
The syntax would simply look like that:
{noformat}
CREATE TABLE foo (
k int PRIMARY KEY,
v tupleint, text, float
)
INSERT INTO foo(k, v) VALUES(0, (3, 'bar', 2.1));
{noformat}
We can also add projections in selects if we want:
{noformat}
SELECT v[0], v[2] FROM foo WHERE k = 0;
{noformat}
but that can come later (after all, we still don't have projections for
collections and it's not a big deal).
--
This message was sent by Atlassian JIRA
(v6.2#6252)
[jira] [Comment Edited] (CASSANDRA-7248) Tuple type
[
https://issues.apache.org/jira/browse/CASSANDRA-7248?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14001504#comment-14001504
]
Sylvain Lebresne edited comment on CASSANDRA-7248 at 5/19/14 2:29 PM:
--
PS: pretty sure this is not a clone of CASSANDRA-6710.
was (Author: slebresne):
PS: pretty sure this is not a clone of CASSANDRA-7248.
Tuple type
--
Key: CASSANDRA-7248
URL: https://issues.apache.org/jira/browse/CASSANDRA-7248
Project: Cassandra
Issue Type: Bug
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
Labels: cql3
Fix For: 2.1 rc1
For CASSANDRA-6875 we need to be able to talk about tuples values and types
(for prepared variables). Since we need it there, clients will need to
support them anyway and so I think it would be a lot cleaner to start
supporting those more generally. Besides, having tuples is a relatively
simple and natural extension to what we have. I'll note in particular that
tuple have a close relationship to user type in the sense that a tuple will
be really just like an anonymous with no name for the fields and in
particular a tuple value will be the same than a user type value.
The syntax would simply look like that:
{noformat}
CREATE TABLE foo (
k int PRIMARY KEY,
v tupleint, text, float
)
INSERT INTO foo(k, v) VALUES(0, (3, 'bar', 2.1));
{noformat}
We can also add projections in selects if we want:
{noformat}
SELECT v[0], v[2] FROM foo WHERE k = 0;
{noformat}
but that can come later (after all, we still don't have projections for
collections and it's not a big deal).
--
This message was sent by Atlassian JIRA
(v6.2#6252)
[jira] [Commented] (CASSANDRA-7248) Tuple type
[
https://issues.apache.org/jira/browse/CASSANDRA-7248?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14001721#comment-14001721
]
Sylvain Lebresne commented on CASSANDRA-7248:
-
Fair enough, I meant CASSANDRA-6710.
Tuple type
--
Key: CASSANDRA-7248
URL: https://issues.apache.org/jira/browse/CASSANDRA-7248
Project: Cassandra
Issue Type: Bug
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
Labels: cql3
Fix For: 2.1 rc1
For CASSANDRA-6875 we need to be able to talk about tuples values and types
(for prepared variables). Since we need it there, clients will need to
support them anyway and so I think it would be a lot cleaner to start
supporting those more generally. Besides, having tuples is a relatively
simple and natural extension to what we have. I'll note in particular that
tuple have a close relationship to user type in the sense that a tuple will
be really just like an anonymous with no name for the fields and in
particular a tuple value will be the same than a user type value.
The syntax would simply look like that:
{noformat}
CREATE TABLE foo (
k int PRIMARY KEY,
v tupleint, text, float
)
INSERT INTO foo(k, v) VALUES(0, (3, 'bar', 2.1));
{noformat}
We can also add projections in selects if we want:
{noformat}
SELECT v[0], v[2] FROM foo WHERE k = 0;
{noformat}
but that can come later (after all, we still don't have projections for
collections and it's not a big deal).
--
This message was sent by Atlassian JIRA
(v6.2#6252)
[jira] [Commented] (CASSANDRA-7248) Tuple type
[
https://issues.apache.org/jira/browse/CASSANDRA-7248?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14001723#comment-14001723
]
Aleksey Yeschenko commented on CASSANDRA-7248:
--
I don't think it is. You can emulate 6710 w/ tuples, but it's not a direct
clone.
Tuple type
--
Key: CASSANDRA-7248
URL: https://issues.apache.org/jira/browse/CASSANDRA-7248
Project: Cassandra
Issue Type: Bug
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
Labels: cql3
Fix For: 2.1 rc1
For CASSANDRA-6875 we need to be able to talk about tuples values and types
(for prepared variables). Since we need it there, clients will need to
support them anyway and so I think it would be a lot cleaner to start
supporting those more generally. Besides, having tuples is a relatively
simple and natural extension to what we have. I'll note in particular that
tuple have a close relationship to user type in the sense that a tuple will
be really just like an anonymous with no name for the fields and in
particular a tuple value will be the same than a user type value.
The syntax would simply look like that:
{noformat}
CREATE TABLE foo (
k int PRIMARY KEY,
v tupleint, text, float
)
INSERT INTO foo(k, v) VALUES(0, (3, 'bar', 2.1));
{noformat}
We can also add projections in selects if we want:
{noformat}
SELECT v[0], v[2] FROM foo WHERE k = 0;
{noformat}
but that can come later (after all, we still don't have projections for
collections and it's not a big deal).
--
This message was sent by Atlassian JIRA
(v6.2#6252)
[jira] [Updated] (CASSANDRA-7264) Add conditional support for the creation/deletion of users
[ https://issues.apache.org/jira/browse/CASSANDRA-7264?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jonathan Ellis updated CASSANDRA-7264: -- Priority: Minor (was: Major) Fix Version/s: 2.1.1 Add conditional support for the creation/deletion of users --- Key: CASSANDRA-7264 URL: https://issues.apache.org/jira/browse/CASSANDRA-7264 Project: Cassandra Issue Type: New Feature Reporter: Hamilton Tran Priority: Minor Fix For: 2.1.1 Currently attempting to do drop user if exists tom; or create user if exists tom password 'tom' does not work. Would be a nice feature to add from a test automation standpoint so that we don't error out when attempting to clean up or create the test environment. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Created] (CASSANDRA-7264) Add conditional support for the creation/deletion of users
Hamilton Tran created CASSANDRA-7264: Summary: Add conditional support for the creation/deletion of users Key: CASSANDRA-7264 URL: https://issues.apache.org/jira/browse/CASSANDRA-7264 Project: Cassandra Issue Type: New Feature Reporter: Hamilton Tran Currently attempting to do drop user if exists tom; or create user if exists tom password 'tom' does not work. Would be a nice feature to add from a test automation standpoint so that we don't error out when attempting to clean up or create the test environment. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7248) Tuple type
[
https://issues.apache.org/jira/browse/CASSANDRA-7248?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14001729#comment-14001729
]
Dave Brosius commented on CASSANDRA-7248:
-
i just meant you could implement 6710 with this. ie if this was implemented,
6710 could be closed, imo.
Tuple type
--
Key: CASSANDRA-7248
URL: https://issues.apache.org/jira/browse/CASSANDRA-7248
Project: Cassandra
Issue Type: Bug
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
Labels: cql3
Fix For: 2.1 rc1
For CASSANDRA-6875 we need to be able to talk about tuples values and types
(for prepared variables). Since we need it there, clients will need to
support them anyway and so I think it would be a lot cleaner to start
supporting those more generally. Besides, having tuples is a relatively
simple and natural extension to what we have. I'll note in particular that
tuple have a close relationship to user type in the sense that a tuple will
be really just like an anonymous with no name for the fields and in
particular a tuple value will be the same than a user type value.
The syntax would simply look like that:
{noformat}
CREATE TABLE foo (
k int PRIMARY KEY,
v tupleint, text, float
)
INSERT INTO foo(k, v) VALUES(0, (3, 'bar', 2.1));
{noformat}
We can also add projections in selects if we want:
{noformat}
SELECT v[0], v[2] FROM foo WHERE k = 0;
{noformat}
but that can come later (after all, we still don't have projections for
collections and it's not a big deal).
--
This message was sent by Atlassian JIRA
(v6.2#6252)
[jira] [Commented] (CASSANDRA-7247) Provide top ten most frequent keys per column family
[ https://issues.apache.org/jira/browse/CASSANDRA-7247?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14001741#comment-14001741 ] Chris Lohfink commented on CASSANDRA-7247: -- Id like to rework this I think to use the trace executor Provide top ten most frequent keys per column family Key: CASSANDRA-7247 URL: https://issues.apache.org/jira/browse/CASSANDRA-7247 Project: Cassandra Issue Type: Improvement Reporter: Chris Lohfink Assignee: Chris Lohfink Priority: Minor Attachments: patch.diff Since already have the nice addthis stream library, can use it to keep track of most frequent DecoratedKeys that come through the system using StreamSummaries ([nice explaination|http://boundary.com/blog/2013/05/14/approximate-heavy-hitters-the-spacesaving-algorithm/]). Then provide a new metric to access them via JMX. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-6803) nodetool getsstables converts key from String incorrectly
[ https://issues.apache.org/jira/browse/CASSANDRA-6803?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14001752#comment-14001752 ] Nate McCall commented on CASSANDRA-6803: Your case was working because of this String.getBytes() bug. CfMetaData's key validator is used everywhere else in the code - essentially why you have to use the assume commands in cqlsh and the hex() function on the cassandra-cli. If you convert your string to the hex representation to pass to nodetool as an argument, it should work fine. nodetool getsstables converts key from String incorrectly - Key: CASSANDRA-6803 URL: https://issues.apache.org/jira/browse/CASSANDRA-6803 Project: Cassandra Issue Type: Bug Components: Tools Reporter: Nate McCall Assignee: Nate McCall Fix For: 1.2.16, 2.0.7 Attachments: sstables_for_key_blob_support.txt, sstables_for_key_blob_support_2.0.txt Trivial fix, just need to get the bytebuffer from the CfMetaData's key validator as opposed to just calling String#getBytes (which is broken for most data types). -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-6803) nodetool getsstables converts key from String incorrectly
[ https://issues.apache.org/jira/browse/CASSANDRA-6803?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14001875#comment-14001875 ] Paulo Ricardo Motta Gomes commented on CASSANDRA-6803: -- yep, makes sense. worked when I used the hex bytes representation. thanks for the clarification! nodetool getsstables converts key from String incorrectly - Key: CASSANDRA-6803 URL: https://issues.apache.org/jira/browse/CASSANDRA-6803 Project: Cassandra Issue Type: Bug Components: Tools Reporter: Nate McCall Assignee: Nate McCall Fix For: 1.2.16, 2.0.7 Attachments: sstables_for_key_blob_support.txt, sstables_for_key_blob_support_2.0.txt Trivial fix, just need to get the bytebuffer from the CfMetaData's key validator as opposed to just calling String#getBytes (which is broken for most data types). -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7262) During streaming: java.lang.AssertionError: Reference counter -1
[
https://issues.apache.org/jira/browse/CASSANDRA-7262?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14001877#comment-14001877
]
Joshua McKenzie commented on CASSANDRA-7262:
I ran into this while working on CASSANDRA-3569 and included the fix in the
patch for that ticket. We had no protection against multiple attempts to
release a reference from within the StreamTransferTask.
{code:title=fix}
@@ -75,11 +77,15 @@ public class StreamTransferTask extends StreamTask
public void abort()
{
-for (OutgoingFileMessage file : files.values())
+// Prevent releasing reference multiple times
+if (aborted.compareAndSet(false, true))
{
-file.sstable.releaseReference();
+for (OutgoingFileMessage file : files.values())
+{
+file.sstable.releaseReference();
+}
+timeoutExecutor.shutdownNow();
}
-timeoutExecutor.shutdownNow();
}
{code}
During streaming: java.lang.AssertionError: Reference counter -1
Key: CASSANDRA-7262
URL: https://issues.apache.org/jira/browse/CASSANDRA-7262
Project: Cassandra
Issue Type: Bug
Components: Core
Environment: Cassandra 2.07, x86-64 Ubuntu 12.04.4, Oracle java
1.7.0_45
Reporter: Duncan Sands
Priority: Minor
Attachments: system.log.gz
Got this assertion failure this weekend during repair:
ERROR [STREAM-IN-/192.168.21.14] 2014-05-17 01:17:52,332 StreamSession.java
(line 420) [Stream #3a3ac8a2-dd50-11e3-b3c1-6bf6dccd6457] Streaming error
occurred
java.lang.RuntimeException: Outgoing stream handler has been closed
at
org.apache.cassandra.streaming.ConnectionHandler.sendMessage(ConnectionHandler.java:170)
at
org.apache.cassandra.streaming.StreamSession.receive(StreamSession.java:483)
at
org.apache.cassandra.streaming.StreamSession.messageReceived(StreamSession.java:372)
at
org.apache.cassandra.streaming.ConnectionHandler$IncomingMessageHandler.run(ConnectionHandler.java:289)
at java.lang.Thread.run(Thread.java:744)
ERROR [STREAM-IN-/192.168.21.14] 2014-05-17 01:17:52,350 CassandraDaemon.java
(line 198) Exception in thread Thread[STREAM-IN-/192.168.21.14,5,RMI Runtime]
java.lang.AssertionError: Reference counter -1 for
/mnt/ssd1/cassandra/data/ldn_production/historical_accounts/ldn_production-historical_accounts-jb-79827-Data.db
at
org.apache.cassandra.io.sstable.SSTableReader.releaseReference(SSTableReader.java:1107)
at
org.apache.cassandra.streaming.StreamTransferTask.abort(StreamTransferTask.java:80)
at
org.apache.cassandra.streaming.StreamSession.closeSession(StreamSession.java:322)
at
org.apache.cassandra.streaming.StreamSession.onError(StreamSession.java:425)
at
org.apache.cassandra.streaming.ConnectionHandler$IncomingMessageHandler.run(ConnectionHandler.java:300)
at java.lang.Thread.run(Thread.java:744)
followed by a few more (the reference counter got down to -3). Got the same
kind of assertion failure on one other node (in a different data centre;
there are 21 nodes altogether distributed over 4 data centres).
I've attached the relevant part of the log. It starts quite a bit before the
assertion failure at the first exception on this node (Cannot proceed on
repair because a neighbor ... is dead), and finishes a few hours afterwards
when the node was restarted.
--
This message was sent by Atlassian JIRA
(v6.2#6252)
[jira] [Commented] (CASSANDRA-7257) only query once for local host id on join
[ https://issues.apache.org/jira/browse/CASSANDRA-7257?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14001896#comment-14001896 ] Jonathan Ellis commented on CASSANDRA-7257: --- +1 only query once for local host id on join - Key: CASSANDRA-7257 URL: https://issues.apache.org/jira/browse/CASSANDRA-7257 Project: Cassandra Issue Type: Improvement Components: Core Reporter: Dave Brosius Assignee: Dave Brosius Priority: Trivial Fix For: 1.2.17 Attachments: 7257.txt switch to just querying once for local host id -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-6851) Improve anticompaction after incremental repair
[ https://issues.apache.org/jira/browse/CASSANDRA-6851?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jonathan Ellis updated CASSANDRA-6851: -- Reviewer: Marcus Eriksson Component/s: Core Assignee: Russell Alexander Spitzer Improve anticompaction after incremental repair --- Key: CASSANDRA-6851 URL: https://issues.apache.org/jira/browse/CASSANDRA-6851 Project: Cassandra Issue Type: Improvement Components: Core Reporter: Marcus Eriksson Assignee: Russell Alexander Spitzer Priority: Minor Labels: compaction, lhf Fix For: 2.1.1 After an incremental repair we iterate over all sstables and split them in two parts, one containing the repaired data and one the unrepaired. We could in theory double the number of sstables on a node. To avoid this we could make anticompaction also do a compaction, for example, if we are to anticompact 10 sstables, we could anticompact those to 2. Note that we need to avoid creating too big sstables though, if we anticompact all sstables on a node it would essentially be a major compaction. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-7251) testDiskFailurePolicy_best_effort assertion error
[ https://issues.apache.org/jira/browse/CASSANDRA-7251?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Joshua McKenzie updated CASSANDRA-7251: --- Attachment: 7251_v1.txt Windows created nested files in tmp without issue - extended length of directory to 255 to force blacklisting on both platforms. testDiskFailurePolicy_best_effort assertion error - Key: CASSANDRA-7251 URL: https://issues.apache.org/jira/browse/CASSANDRA-7251 Project: Cassandra Issue Type: Sub-task Environment: win7, trunk Reporter: Joshua McKenzie Assignee: Joshua McKenzie Priority: Minor Labels: Windows Fix For: 3.0 Attachments: 7251_v1.txt [junit] Testsuite: org.apache.cassandra.db.DirectoriesTest [junit] Tests run: 4, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 1.297 sec [junit] [junit] Testcase: testDiskFailurePolicy_best_effort(org.apache.cassandra.db.DirectoriesTest): FAILED [junit] [junit] junit.framework.AssertionFailedError: [junit] at org.apache.cassandra.db.DirectoriesTest.testDiskFailurePolicy_best_effort(DirectoriesTest.java:207) [junit] [junit] [junit] Test org.apache.cassandra.db.DirectoriesTest FAILED -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Assigned] (CASSANDRA-7264) Add conditional support for the creation/deletion of users
[ https://issues.apache.org/jira/browse/CASSANDRA-7264?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Aleksey Yeschenko reassigned CASSANDRA-7264: Assignee: Aleksey Yeschenko Add conditional support for the creation/deletion of users --- Key: CASSANDRA-7264 URL: https://issues.apache.org/jira/browse/CASSANDRA-7264 Project: Cassandra Issue Type: New Feature Reporter: Hamilton Tran Assignee: Aleksey Yeschenko Priority: Minor Fix For: 2.1.1 Currently attempting to do drop user if exists tom; or create user if exists tom password 'tom' does not work. Would be a nice feature to add from a test automation standpoint so that we don't error out when attempting to clean up or create the test environment. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Created] (CASSANDRA-7265) DataOutputTest unit test failure on Windows
Joshua McKenzie created CASSANDRA-7265: -- Summary: DataOutputTest unit test failure on Windows Key: CASSANDRA-7265 URL: https://issues.apache.org/jira/browse/CASSANDRA-7265 Project: Cassandra Issue Type: Sub-task Reporter: Joshua McKenzie Assignee: Joshua McKenzie Priority: Minor Fix For: 3.0 [junit] Testsuite: org.apache.cassandra.io.util.DataOutputTest [junit] Tests run: 8, Failures: 3, Errors: 0, Skipped: 0, Time elapsed: 1.525 sec [junit] [junit] - Standard Output --- [junit] WARN 15:58:13 JNA link failure, one or more native method will be unavailable. [junit] WARN 15:58:13 JNA link failure, one or more native method will be unavailable. [junit] - --- [junit] Testcase: testSequentialWriter(org.apache.cassandra.io.util.DataOutputTest):FAILED [junit] [junit] junit.framework.AssertionFailedError: [junit] at org.apache.cassandra.io.util.DataOutputTest.testSequentialWriter(DataOutputTest.java:142) [junit] [junit] [junit] Testcase: testRandomAccessFile(org.apache.cassandra.io.util.DataOutputTest):FAILED [junit] [junit] junit.framework.AssertionFailedError: [junit] at org.apache.cassandra.io.util.DataOutputTest.testRandomAccessFile(DataOutputTest.java:127) [junit] [junit] [junit] Testcase: testFileOutputStream(org.apache.cassandra.io.util.DataOutputTest):FAILED [junit] [junit] junit.framework.AssertionFailedError: [junit] at org.apache.cassandra.io.util.DataOutputTest.testFileOutputStream(DataOutputTest.java:108) [junit] [junit] [junit] Test org.apache.cassandra.io.util.DataOutputTest FAILED -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Resolved] (CASSANDRA-7262) During streaming: java.lang.AssertionError: Reference counter -1
[ https://issues.apache.org/jira/browse/CASSANDRA-7262?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Brandon Williams resolved CASSANDRA-7262. - Resolution: Duplicate During streaming: java.lang.AssertionError: Reference counter -1 Key: CASSANDRA-7262 URL: https://issues.apache.org/jira/browse/CASSANDRA-7262 Project: Cassandra Issue Type: Bug Components: Core Environment: Cassandra 2.07, x86-64 Ubuntu 12.04.4, Oracle java 1.7.0_45 Reporter: Duncan Sands Priority: Minor Attachments: system.log.gz Got this assertion failure this weekend during repair: ERROR [STREAM-IN-/192.168.21.14] 2014-05-17 01:17:52,332 StreamSession.java (line 420) [Stream #3a3ac8a2-dd50-11e3-b3c1-6bf6dccd6457] Streaming error occurred java.lang.RuntimeException: Outgoing stream handler has been closed at org.apache.cassandra.streaming.ConnectionHandler.sendMessage(ConnectionHandler.java:170) at org.apache.cassandra.streaming.StreamSession.receive(StreamSession.java:483) at org.apache.cassandra.streaming.StreamSession.messageReceived(StreamSession.java:372) at org.apache.cassandra.streaming.ConnectionHandler$IncomingMessageHandler.run(ConnectionHandler.java:289) at java.lang.Thread.run(Thread.java:744) ERROR [STREAM-IN-/192.168.21.14] 2014-05-17 01:17:52,350 CassandraDaemon.java (line 198) Exception in thread Thread[STREAM-IN-/192.168.21.14,5,RMI Runtime] java.lang.AssertionError: Reference counter -1 for /mnt/ssd1/cassandra/data/ldn_production/historical_accounts/ldn_production-historical_accounts-jb-79827-Data.db at org.apache.cassandra.io.sstable.SSTableReader.releaseReference(SSTableReader.java:1107) at org.apache.cassandra.streaming.StreamTransferTask.abort(StreamTransferTask.java:80) at org.apache.cassandra.streaming.StreamSession.closeSession(StreamSession.java:322) at org.apache.cassandra.streaming.StreamSession.onError(StreamSession.java:425) at org.apache.cassandra.streaming.ConnectionHandler$IncomingMessageHandler.run(ConnectionHandler.java:300) at java.lang.Thread.run(Thread.java:744) followed by a few more (the reference counter got down to -3). Got the same kind of assertion failure on one other node (in a different data centre; there are 21 nodes altogether distributed over 4 data centres). I've attached the relevant part of the log. It starts quite a bit before the assertion failure at the first exception on this node (Cannot proceed on repair because a neighbor ... is dead), and finishes a few hours afterwards when the node was restarted. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7255) Rename nodetool cleanup
[ https://issues.apache.org/jira/browse/CASSANDRA-7255?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14002000#comment-14002000 ] Brandon Williams commented on CASSANDRA-7255: - I'm not sure this is going to help anything: stupid is as stupid does. 'trim' in particular doesn't seem any clearer, and 'cleanranges' requires cassandra knowledge that would prevent this problem to begin with. Rename nodetool cleanup --- Key: CASSANDRA-7255 URL: https://issues.apache.org/jira/browse/CASSANDRA-7255 Project: Cassandra Issue Type: Improvement Components: Tools Reporter: Tyler Hobbs Priority: Trivial A lot of cassandra users seem to think nodetool cleanup does all kinds of things that it doesn't. For example, you'll find a lot of quotes like this in IRC and on the mailing list: bq. you need to run 'nodetool cleanup' to make sure all tombstones are deleted Renaming it to something clearer could help cut down on the confusion. Perhaps nodetool cleanranges or nodetool trim. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7216) Restricted superuser account request
[ https://issues.apache.org/jira/browse/CASSANDRA-7216?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14002012#comment-14002012 ] Aleksey Yeschenko commented on CASSANDRA-7216: -- I think I might have another idea, one that wouldn't require adding new CQL syntax. Will attach a patch soon-ish. Restricted superuser account request Key: CASSANDRA-7216 URL: https://issues.apache.org/jira/browse/CASSANDRA-7216 Project: Cassandra Issue Type: Improvement Reporter: Oded Peer Assignee: Dave Brosius Priority: Minor Fix For: 3.0 Attachments: 7216.txt I am developing a multi-tenant service. Every tenant has its own user, keyspace and can access only his keyspace. As new tenants are provisioned there is a need to create new users and keyspaces. Only a superuser can issue CREATE USER requests, so we must have a super user account in the system. On the other hand super users have access to all the keyspaces, which poses a security risk. For tenant provisioning I would like to have a restricted account which can only create new users, without read access to keyspaces. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Reopened] (CASSANDRA-7262) During streaming: java.lang.AssertionError: Reference counter -1
[ https://issues.apache.org/jira/browse/CASSANDRA-7262?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jonathan Ellis reopened CASSANDRA-7262: --- I'm okay with committing this separately since it's really a bug and 3569 is a new feature. Also I will probably commit sooner than Marcus. :) During streaming: java.lang.AssertionError: Reference counter -1 Key: CASSANDRA-7262 URL: https://issues.apache.org/jira/browse/CASSANDRA-7262 Project: Cassandra Issue Type: Bug Components: Core Environment: Cassandra 2.07, x86-64 Ubuntu 12.04.4, Oracle java 1.7.0_45 Reporter: Duncan Sands Priority: Minor Attachments: system.log.gz Got this assertion failure this weekend during repair: ERROR [STREAM-IN-/192.168.21.14] 2014-05-17 01:17:52,332 StreamSession.java (line 420) [Stream #3a3ac8a2-dd50-11e3-b3c1-6bf6dccd6457] Streaming error occurred java.lang.RuntimeException: Outgoing stream handler has been closed at org.apache.cassandra.streaming.ConnectionHandler.sendMessage(ConnectionHandler.java:170) at org.apache.cassandra.streaming.StreamSession.receive(StreamSession.java:483) at org.apache.cassandra.streaming.StreamSession.messageReceived(StreamSession.java:372) at org.apache.cassandra.streaming.ConnectionHandler$IncomingMessageHandler.run(ConnectionHandler.java:289) at java.lang.Thread.run(Thread.java:744) ERROR [STREAM-IN-/192.168.21.14] 2014-05-17 01:17:52,350 CassandraDaemon.java (line 198) Exception in thread Thread[STREAM-IN-/192.168.21.14,5,RMI Runtime] java.lang.AssertionError: Reference counter -1 for /mnt/ssd1/cassandra/data/ldn_production/historical_accounts/ldn_production-historical_accounts-jb-79827-Data.db at org.apache.cassandra.io.sstable.SSTableReader.releaseReference(SSTableReader.java:1107) at org.apache.cassandra.streaming.StreamTransferTask.abort(StreamTransferTask.java:80) at org.apache.cassandra.streaming.StreamSession.closeSession(StreamSession.java:322) at org.apache.cassandra.streaming.StreamSession.onError(StreamSession.java:425) at org.apache.cassandra.streaming.ConnectionHandler$IncomingMessageHandler.run(ConnectionHandler.java:300) at java.lang.Thread.run(Thread.java:744) followed by a few more (the reference counter got down to -3). Got the same kind of assertion failure on one other node (in a different data centre; there are 21 nodes altogether distributed over 4 data centres). I've attached the relevant part of the log. It starts quite a bit before the assertion failure at the first exception on this node (Cannot proceed on repair because a neighbor ... is dead), and finishes a few hours afterwards when the node was restarted. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-7262) During streaming: java.lang.AssertionError: Reference counter -1
[ https://issues.apache.org/jira/browse/CASSANDRA-7262?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jonathan Ellis updated CASSANDRA-7262: -- Reviewer: Jonathan Ellis Fix Version/s: 2.1 rc1 2.0.8 Assignee: Joshua McKenzie During streaming: java.lang.AssertionError: Reference counter -1 Key: CASSANDRA-7262 URL: https://issues.apache.org/jira/browse/CASSANDRA-7262 Project: Cassandra Issue Type: Bug Components: Core Environment: Cassandra 2.07, x86-64 Ubuntu 12.04.4, Oracle java 1.7.0_45 Reporter: Duncan Sands Assignee: Joshua McKenzie Priority: Minor Fix For: 2.0.8, 2.1 rc1 Attachments: system.log.gz Got this assertion failure this weekend during repair: ERROR [STREAM-IN-/192.168.21.14] 2014-05-17 01:17:52,332 StreamSession.java (line 420) [Stream #3a3ac8a2-dd50-11e3-b3c1-6bf6dccd6457] Streaming error occurred java.lang.RuntimeException: Outgoing stream handler has been closed at org.apache.cassandra.streaming.ConnectionHandler.sendMessage(ConnectionHandler.java:170) at org.apache.cassandra.streaming.StreamSession.receive(StreamSession.java:483) at org.apache.cassandra.streaming.StreamSession.messageReceived(StreamSession.java:372) at org.apache.cassandra.streaming.ConnectionHandler$IncomingMessageHandler.run(ConnectionHandler.java:289) at java.lang.Thread.run(Thread.java:744) ERROR [STREAM-IN-/192.168.21.14] 2014-05-17 01:17:52,350 CassandraDaemon.java (line 198) Exception in thread Thread[STREAM-IN-/192.168.21.14,5,RMI Runtime] java.lang.AssertionError: Reference counter -1 for /mnt/ssd1/cassandra/data/ldn_production/historical_accounts/ldn_production-historical_accounts-jb-79827-Data.db at org.apache.cassandra.io.sstable.SSTableReader.releaseReference(SSTableReader.java:1107) at org.apache.cassandra.streaming.StreamTransferTask.abort(StreamTransferTask.java:80) at org.apache.cassandra.streaming.StreamSession.closeSession(StreamSession.java:322) at org.apache.cassandra.streaming.StreamSession.onError(StreamSession.java:425) at org.apache.cassandra.streaming.ConnectionHandler$IncomingMessageHandler.run(ConnectionHandler.java:300) at java.lang.Thread.run(Thread.java:744) followed by a few more (the reference counter got down to -3). Got the same kind of assertion failure on one other node (in a different data centre; there are 21 nodes altogether distributed over 4 data centres). I've attached the relevant part of the log. It starts quite a bit before the assertion failure at the first exception on this node (Cannot proceed on repair because a neighbor ... is dead), and finishes a few hours afterwards when the node was restarted. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-6454) Pig support for hadoop CqlInputFormat
[ https://issues.apache.org/jira/browse/CASSANDRA-6454?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14002123#comment-14002123 ] Alex Liu commented on CASSANDRA-6454: - [~minishri] Do you enable native port 9042 on all the nodes? If the native port is different from 9042, set it in url native_port=native_port Pig support for hadoop CqlInputFormat - Key: CASSANDRA-6454 URL: https://issues.apache.org/jira/browse/CASSANDRA-6454 Project: Cassandra Issue Type: Bug Components: Hadoop Reporter: Alex Liu Assignee: Alex Liu Fix For: 2.0.9 Attachments: 6454-2.0-branch.txt CASSANDRA-6311 adds new CqlInputFormat, we need add the Pig support for it -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Created] (CASSANDRA-7266) Allow cqlsh shell ignore .cassandra permission errors and not fail to open the cqlsh shell.
Carolyn Jung created CASSANDRA-7266: --- Summary: Allow cqlsh shell ignore .cassandra permission errors and not fail to open the cqlsh shell. Key: CASSANDRA-7266 URL: https://issues.apache.org/jira/browse/CASSANDRA-7266 Project: Cassandra Issue Type: Improvement Components: Tools Reporter: Carolyn Jung Priority: Minor There is an issue with home directories not working and this is causing users to not be able to execute cqlsh shell. CQLSH shell uses the .cassandra folder in the user's home directory for history and currently throws error and returns you to the prompt. Below is the error: -bash-4.1$ cqlsh Traceback (most recent call last): File /usr/bin/cqlsh, line 141, in module os.mkdir(HISTORY_DIR) OSError: [Errno 13] Permission denied: '/home/testuser/.cassandra' In this example, testuser does not have access to the home directory. Requested resolution is to allow a user to access the cqlsh shell even though the home directory is inaccessible. The current workaround is to gain access to the home directory. This is not acceptable in all cases because of security policies of the organization. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-6285) 2.0 HSHA server introduces corrupt data
[ https://issues.apache.org/jira/browse/CASSANDRA-6285?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14002142#comment-14002142 ] Rick Branson commented on CASSANDRA-6285: - Haven't been able to repro in over 5 days. We're considering the enable_reallocate_buffers.txt patch fixed and production-ready. 2.0 HSHA server introduces corrupt data --- Key: CASSANDRA-6285 URL: https://issues.apache.org/jira/browse/CASSANDRA-6285 Project: Cassandra Issue Type: Bug Components: Core Environment: 4 nodes, shortly updated from 1.2.11 to 2.0.2 Reporter: David Sauer Assignee: Pavel Yaskevich Priority: Critical Fix For: 2.0.8 Attachments: 6285_testnotes1.txt, CASSANDRA-6285-disruptor-heap.patch, cassandra-attack-src.zip, compaction_test.py, disruptor-high-cpu.patch, disruptor-memory-corruption.patch, enable_reallocate_buffers.txt After altering everything to LCS the table OpsCenter.rollups60 amd one other none OpsCenter-Table got stuck with everything hanging around in L0. The compaction started and ran until the logs showed this: ERROR [CompactionExecutor:111] 2013-11-01 19:14:53,865 CassandraDaemon.java (line 187) Exception in thread Thread[CompactionExecutor:111,1,RMI Runtime] java.lang.RuntimeException: Last written key DecoratedKey(1326283851463420237, 37382e34362e3132382e3139382d6a7576616c69735f6e6f72785f696e6465785f323031335f31305f30382d63616368655f646f63756d656e74736c6f6f6b75702d676574426c6f6f6d46696c746572537061636555736564) = current key DecoratedKey(954210699457429663, 37382e34362e3132382e3139382d6a7576616c69735f6e6f72785f696e6465785f323031335f31305f30382d63616368655f646f63756d656e74736c6f6f6b75702d676574546f74616c4469736b5370616365557365640b0f) writing into /var/lib/cassandra/data/OpsCenter/rollups60/OpsCenter-rollups60-tmp-jb-58656-Data.db at org.apache.cassandra.io.sstable.SSTableWriter.beforeAppend(SSTableWriter.java:141) at org.apache.cassandra.io.sstable.SSTableWriter.append(SSTableWriter.java:164) at org.apache.cassandra.db.compaction.CompactionTask.runWith(CompactionTask.java:160) at org.apache.cassandra.io.util.DiskAwareRunnable.runMayThrow(DiskAwareRunnable.java:48) at org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:28) at org.apache.cassandra.db.compaction.CompactionTask.executeInternal(CompactionTask.java:60) at org.apache.cassandra.db.compaction.AbstractCompactionTask.execute(AbstractCompactionTask.java:59) at org.apache.cassandra.db.compaction.CompactionManager$6.runMayThrow(CompactionManager.java:296) at org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:28) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:724) Moving back to STC worked to keep the compactions running. Especialy my own Table i would like to move to LCS. After a major compaction with STC the move to LCS fails with the same Exception. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7262) During streaming: java.lang.AssertionError: Reference counter -1
[
https://issues.apache.org/jira/browse/CASSANDRA-7262?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14002165#comment-14002165
]
Jonathan Ellis commented on CASSANDRA-7262:
---
[~JoshuaMcKenzie] can you provide a complete patch? E.g. this references the
undeclared {{aborted}} field.
During streaming: java.lang.AssertionError: Reference counter -1
Key: CASSANDRA-7262
URL: https://issues.apache.org/jira/browse/CASSANDRA-7262
Project: Cassandra
Issue Type: Bug
Components: Core
Environment: Cassandra 2.07, x86-64 Ubuntu 12.04.4, Oracle java
1.7.0_45
Reporter: Duncan Sands
Assignee: Joshua McKenzie
Priority: Minor
Fix For: 2.0.8, 2.1 rc1
Attachments: system.log.gz
Got this assertion failure this weekend during repair:
ERROR [STREAM-IN-/192.168.21.14] 2014-05-17 01:17:52,332 StreamSession.java
(line 420) [Stream #3a3ac8a2-dd50-11e3-b3c1-6bf6dccd6457] Streaming error
occurred
java.lang.RuntimeException: Outgoing stream handler has been closed
at
org.apache.cassandra.streaming.ConnectionHandler.sendMessage(ConnectionHandler.java:170)
at
org.apache.cassandra.streaming.StreamSession.receive(StreamSession.java:483)
at
org.apache.cassandra.streaming.StreamSession.messageReceived(StreamSession.java:372)
at
org.apache.cassandra.streaming.ConnectionHandler$IncomingMessageHandler.run(ConnectionHandler.java:289)
at java.lang.Thread.run(Thread.java:744)
ERROR [STREAM-IN-/192.168.21.14] 2014-05-17 01:17:52,350 CassandraDaemon.java
(line 198) Exception in thread Thread[STREAM-IN-/192.168.21.14,5,RMI Runtime]
java.lang.AssertionError: Reference counter -1 for
/mnt/ssd1/cassandra/data/ldn_production/historical_accounts/ldn_production-historical_accounts-jb-79827-Data.db
at
org.apache.cassandra.io.sstable.SSTableReader.releaseReference(SSTableReader.java:1107)
at
org.apache.cassandra.streaming.StreamTransferTask.abort(StreamTransferTask.java:80)
at
org.apache.cassandra.streaming.StreamSession.closeSession(StreamSession.java:322)
at
org.apache.cassandra.streaming.StreamSession.onError(StreamSession.java:425)
at
org.apache.cassandra.streaming.ConnectionHandler$IncomingMessageHandler.run(ConnectionHandler.java:300)
at java.lang.Thread.run(Thread.java:744)
followed by a few more (the reference counter got down to -3). Got the same
kind of assertion failure on one other node (in a different data centre;
there are 21 nodes altogether distributed over 4 data centres).
I've attached the relevant part of the log. It starts quite a bit before the
assertion failure at the first exception on this node (Cannot proceed on
repair because a neighbor ... is dead), and finishes a few hours afterwards
when the node was restarted.
--
This message was sent by Atlassian JIRA
(v6.2#6252)
[5/5] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/61084fb5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/61084fb5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/61084fb5 Branch: refs/heads/trunk Commit: 61084fb53b92be987134028d796a6245fd3c1c0b Parents: 8c2d938 606bc51 Author: Brandon Williams brandonwilli...@apache.org Authored: Mon May 19 13:59:20 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon May 19 13:59:20 2014 -0500 -- CHANGES.txt | 16 build.xml | 2 +- .../cassandra/thrift/THsHaDisruptorServer.java | 3 ++- 3 files changed, 19 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/61084fb5/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/61084fb5/build.xml --
[3/5] git commit: Switch disruptor to 0.3.5
Switch disruptor to 0.3.5 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/606bc51e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/606bc51e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/606bc51e Branch: refs/heads/trunk Commit: 606bc51e0de9c25ab548b7a3f7a4d457fd3109ee Parents: e141694 Author: Brandon Williams brandonwilli...@apache.org Authored: Mon May 19 13:58:57 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon May 19 13:58:57 2014 -0500 -- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/606bc51e/build.xml -- diff --git a/build.xml b/build.xml index c6dd55e..d7cddf6 100644 --- a/build.xml +++ b/build.xml @@ -363,7 +363,7 @@ dependency groupId=com.googlecode.json-simple artifactId=json-simple version=1.1/ dependency groupId=com.boundary artifactId=high-scale-lib version=1.0.6/ dependency groupId=com.github.jbellis artifactId=jamm version=0.2.6/ - dependency groupId=com.thinkaurelius.thrift artifactId=thrift-server version=0.3.3 + dependency groupId=com.thinkaurelius.thrift artifactId=thrift-server version=0.3.5 exclusion groupId=org.slf4j artifactId=slf4j-log4j12/ /dependency dependency groupId=org.yaml artifactId=snakeyaml version=1.11/
[4/5] git commit: Switch disruptor to 0.3.5
Switch disruptor to 0.3.5 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/606bc51e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/606bc51e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/606bc51e Branch: refs/heads/cassandra-2.1 Commit: 606bc51e0de9c25ab548b7a3f7a4d457fd3109ee Parents: e141694 Author: Brandon Williams brandonwilli...@apache.org Authored: Mon May 19 13:58:57 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon May 19 13:58:57 2014 -0500 -- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/606bc51e/build.xml -- diff --git a/build.xml b/build.xml index c6dd55e..d7cddf6 100644 --- a/build.xml +++ b/build.xml @@ -363,7 +363,7 @@ dependency groupId=com.googlecode.json-simple artifactId=json-simple version=1.1/ dependency groupId=com.boundary artifactId=high-scale-lib version=1.0.6/ dependency groupId=com.github.jbellis artifactId=jamm version=0.2.6/ - dependency groupId=com.thinkaurelius.thrift artifactId=thrift-server version=0.3.3 + dependency groupId=com.thinkaurelius.thrift artifactId=thrift-server version=0.3.5 exclusion groupId=org.slf4j artifactId=slf4j-log4j12/ /dependency dependency groupId=org.yaml artifactId=snakeyaml version=1.11/
[1/5] git commit: Always reallocate buffers with HSHA.
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 51583ad3d - 606bc51e0 refs/heads/trunk 8c2d938ef - 61084fb53 Always reallocate buffers with HSHA. Patch by brandonwilliams, reviewed by Rick Branson for CASSANDRA-6285 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e141694e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e141694e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e141694e Branch: refs/heads/cassandra-2.1 Commit: e141694e2bcaecf3c604f3c60b622f8cc63f3b46 Parents: 51583ad Author: Brandon Williams brandonwilli...@apache.org Authored: Mon May 19 13:52:40 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon May 19 13:58:16 2014 -0500 -- CHANGES.txt | 16 .../cassandra/thrift/THsHaDisruptorServer.java | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e141694e/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 860e8e2..ef678f1 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -17,6 +17,7 @@ * Limit user types to the keyspace they are defined in (CASSANDRA-6643) * Add validate method to CollectionType (CASSANDRA-7208) Merged from 2.0: + * Always reallocate buffers in HSHA (CASSANDRA-6285) * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221) * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228) * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067) @@ -39,6 +40,21 @@ Merged from 2.0: * Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818) * Proper null handle for IF with map element access (CASSANDRA-7155) * Improve compaction visibility (CASSANDRA-7242) + * Correctly delete scheduled range xfers (CASSANDRA-7143) + * Make batchlog replica selection rack-aware (CASSANDRA-6551) + * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072) + * Set JMX RMI port to 7199 (CASSANDRA-7087) + * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939) + * Log a warning for large batches (CASSANDRA-6487) + * Queries on compact tables can return more rows that requested (CASSANDRA-7052) + * USING TIMESTAMP for batches does not work (CASSANDRA-7053) + * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949) + * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047) + * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074) + * Plug holes in resource release when wiring up StreamSession (CASSANDRA-7073) + * Re-add parameter columns to tracing session (CASSANDRA-6942) + * Fix writetime/ttl functions for static columns (CASSANDRA-7081) + * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142) Merged from 1.2: * Add Cloudstack snitch (CASSANDRA-7147) * Update system.peers correctly when relocating tokens (CASSANDRA-7126) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e141694e/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java -- diff --git a/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java b/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java index fb7ef35..e3b89d2 100644 --- a/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java +++ b/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java @@ -86,7 +86,8 @@ public class THsHaDisruptorServer extends TDisruptorServer .inputProtocolFactory(protocolFactory) .outputProtocolFactory(protocolFactory) .processor(args.processor) - .maxFrameSizeInBytes(DatabaseDescriptor.getThriftFramedTransportSize()); + .maxFrameSizeInBytes(DatabaseDescriptor.getThriftFramedTransportSize()) + .alwaysReallocateBuffers(true); return new THsHaDisruptorServer(serverArgs); }
[2/5] git commit: Always reallocate buffers with HSHA.
Always reallocate buffers with HSHA. Patch by brandonwilliams, reviewed by Rick Branson for CASSANDRA-6285 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e141694e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e141694e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e141694e Branch: refs/heads/trunk Commit: e141694e2bcaecf3c604f3c60b622f8cc63f3b46 Parents: 51583ad Author: Brandon Williams brandonwilli...@apache.org Authored: Mon May 19 13:52:40 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon May 19 13:58:16 2014 -0500 -- CHANGES.txt | 16 .../cassandra/thrift/THsHaDisruptorServer.java | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e141694e/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 860e8e2..ef678f1 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -17,6 +17,7 @@ * Limit user types to the keyspace they are defined in (CASSANDRA-6643) * Add validate method to CollectionType (CASSANDRA-7208) Merged from 2.0: + * Always reallocate buffers in HSHA (CASSANDRA-6285) * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221) * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228) * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067) @@ -39,6 +40,21 @@ Merged from 2.0: * Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818) * Proper null handle for IF with map element access (CASSANDRA-7155) * Improve compaction visibility (CASSANDRA-7242) + * Correctly delete scheduled range xfers (CASSANDRA-7143) + * Make batchlog replica selection rack-aware (CASSANDRA-6551) + * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072) + * Set JMX RMI port to 7199 (CASSANDRA-7087) + * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939) + * Log a warning for large batches (CASSANDRA-6487) + * Queries on compact tables can return more rows that requested (CASSANDRA-7052) + * USING TIMESTAMP for batches does not work (CASSANDRA-7053) + * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949) + * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047) + * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074) + * Plug holes in resource release when wiring up StreamSession (CASSANDRA-7073) + * Re-add parameter columns to tracing session (CASSANDRA-6942) + * Fix writetime/ttl functions for static columns (CASSANDRA-7081) + * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142) Merged from 1.2: * Add Cloudstack snitch (CASSANDRA-7147) * Update system.peers correctly when relocating tokens (CASSANDRA-7126) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e141694e/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java -- diff --git a/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java b/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java index fb7ef35..e3b89d2 100644 --- a/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java +++ b/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java @@ -86,7 +86,8 @@ public class THsHaDisruptorServer extends TDisruptorServer .inputProtocolFactory(protocolFactory) .outputProtocolFactory(protocolFactory) .processor(args.processor) - .maxFrameSizeInBytes(DatabaseDescriptor.getThriftFramedTransportSize()); + .maxFrameSizeInBytes(DatabaseDescriptor.getThriftFramedTransportSize()) + .alwaysReallocateBuffers(true); return new THsHaDisruptorServer(serverArgs); }
[5/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/40ab7743 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40ab7743 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40ab7743 Branch: refs/heads/cassandra-2.1 Commit: 40ab774380ace0e2005d15266918d196b0ccd786 Parents: 606bc51 b9802ff Author: Brandon Williams brandonwilli...@apache.org Authored: Mon May 19 14:01:40 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon May 19 14:01:40 2014 -0500 -- --
[2/6] git commit: Always reallocate buffers with HSHA.
Always reallocate buffers with HSHA. Patch by brandonwilliams, reviewed by Rick Branson for CASSANDRA-6285 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b9802ffb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9802ffb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b9802ffb Branch: refs/heads/cassandra-2.1 Commit: b9802ffbc4d22e5a6a608f16113d8a0d7914a319 Parents: e3a88b9 Author: Brandon Williams brandonwilli...@apache.org Authored: Mon May 19 13:52:40 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon May 19 14:01:14 2014 -0500 -- CHANGES.txt | 14 ++ .../apache/cassandra/thrift/THsHaDisruptorServer.java | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9802ffb/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index ed818db..df3741e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,18 @@ 2.0.8 + * Always reallocate buffers in HSHA (CASSANDRA-6285) + * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221) + * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228) + * Fix potential SlabAllocator yield-starvation (CASSANDRA-7133) + * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067) + * Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177) + * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183) + * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162) + * Fix disabling autocompaction (CASSANDRA-7187) + * Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088) + * cqlsh can't tab-complete disabling compaction (CASSANDRA-7185) + * cqlsh: Accept and execute CQL statement(s) from command-line parameter (CASSANDRA-7172) + * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198) + * Fix the InvertedIndex trigger example (CASSANDRA-7211) * Correctly delete scheduled range xfers (CASSANDRA-7143) * Make batchlog replica selection rack-aware (CASSANDRA-6551) * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9802ffb/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java -- diff --git a/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java b/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java index fb7ef35..e3b89d2 100644 --- a/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java +++ b/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java @@ -86,7 +86,8 @@ public class THsHaDisruptorServer extends TDisruptorServer .inputProtocolFactory(protocolFactory) .outputProtocolFactory(protocolFactory) .processor(args.processor) - .maxFrameSizeInBytes(DatabaseDescriptor.getThriftFramedTransportSize()); + .maxFrameSizeInBytes(DatabaseDescriptor.getThriftFramedTransportSize()) + .alwaysReallocateBuffers(true); return new THsHaDisruptorServer(serverArgs); }
[1/6] git commit: Always reallocate buffers with HSHA.
Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 e3a88b9f8 - b9802ffbc refs/heads/cassandra-2.1 606bc51e0 - 40ab77438 refs/heads/trunk 61084fb53 - 3f929971a Always reallocate buffers with HSHA. Patch by brandonwilliams, reviewed by Rick Branson for CASSANDRA-6285 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b9802ffb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9802ffb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b9802ffb Branch: refs/heads/cassandra-2.0 Commit: b9802ffbc4d22e5a6a608f16113d8a0d7914a319 Parents: e3a88b9 Author: Brandon Williams brandonwilli...@apache.org Authored: Mon May 19 13:52:40 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon May 19 14:01:14 2014 -0500 -- CHANGES.txt | 14 ++ .../apache/cassandra/thrift/THsHaDisruptorServer.java | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9802ffb/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index ed818db..df3741e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,18 @@ 2.0.8 + * Always reallocate buffers in HSHA (CASSANDRA-6285) + * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221) + * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228) + * Fix potential SlabAllocator yield-starvation (CASSANDRA-7133) + * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067) + * Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177) + * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183) + * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162) + * Fix disabling autocompaction (CASSANDRA-7187) + * Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088) + * cqlsh can't tab-complete disabling compaction (CASSANDRA-7185) + * cqlsh: Accept and execute CQL statement(s) from command-line parameter (CASSANDRA-7172) + * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198) + * Fix the InvertedIndex trigger example (CASSANDRA-7211) * Correctly delete scheduled range xfers (CASSANDRA-7143) * Make batchlog replica selection rack-aware (CASSANDRA-6551) * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9802ffb/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java -- diff --git a/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java b/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java index fb7ef35..e3b89d2 100644 --- a/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java +++ b/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java @@ -86,7 +86,8 @@ public class THsHaDisruptorServer extends TDisruptorServer .inputProtocolFactory(protocolFactory) .outputProtocolFactory(protocolFactory) .processor(args.processor) - .maxFrameSizeInBytes(DatabaseDescriptor.getThriftFramedTransportSize()); + .maxFrameSizeInBytes(DatabaseDescriptor.getThriftFramedTransportSize()) + .alwaysReallocateBuffers(true); return new THsHaDisruptorServer(serverArgs); }
[6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3f929971 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f929971 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3f929971 Branch: refs/heads/trunk Commit: 3f929971af3dac848a1764efbe8e9d501fcae86e Parents: 61084fb 40ab774 Author: Brandon Williams brandonwilli...@apache.org Authored: Mon May 19 14:01:54 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon May 19 14:01:54 2014 -0500 -- --
[3/6] git commit: Always reallocate buffers with HSHA.
Always reallocate buffers with HSHA. Patch by brandonwilliams, reviewed by Rick Branson for CASSANDRA-6285 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b9802ffb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9802ffb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b9802ffb Branch: refs/heads/trunk Commit: b9802ffbc4d22e5a6a608f16113d8a0d7914a319 Parents: e3a88b9 Author: Brandon Williams brandonwilli...@apache.org Authored: Mon May 19 13:52:40 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon May 19 14:01:14 2014 -0500 -- CHANGES.txt | 14 ++ .../apache/cassandra/thrift/THsHaDisruptorServer.java | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9802ffb/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index ed818db..df3741e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,18 @@ 2.0.8 + * Always reallocate buffers in HSHA (CASSANDRA-6285) + * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221) + * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228) + * Fix potential SlabAllocator yield-starvation (CASSANDRA-7133) + * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067) + * Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177) + * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183) + * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162) + * Fix disabling autocompaction (CASSANDRA-7187) + * Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088) + * cqlsh can't tab-complete disabling compaction (CASSANDRA-7185) + * cqlsh: Accept and execute CQL statement(s) from command-line parameter (CASSANDRA-7172) + * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198) + * Fix the InvertedIndex trigger example (CASSANDRA-7211) * Correctly delete scheduled range xfers (CASSANDRA-7143) * Make batchlog replica selection rack-aware (CASSANDRA-6551) * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9802ffb/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java -- diff --git a/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java b/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java index fb7ef35..e3b89d2 100644 --- a/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java +++ b/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java @@ -86,7 +86,8 @@ public class THsHaDisruptorServer extends TDisruptorServer .inputProtocolFactory(protocolFactory) .outputProtocolFactory(protocolFactory) .processor(args.processor) - .maxFrameSizeInBytes(DatabaseDescriptor.getThriftFramedTransportSize()); + .maxFrameSizeInBytes(DatabaseDescriptor.getThriftFramedTransportSize()) + .alwaysReallocateBuffers(true); return new THsHaDisruptorServer(serverArgs); }
[4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/40ab7743 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40ab7743 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40ab7743 Branch: refs/heads/trunk Commit: 40ab774380ace0e2005d15266918d196b0ccd786 Parents: 606bc51 b9802ff Author: Brandon Williams brandonwilli...@apache.org Authored: Mon May 19 14:01:40 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon May 19 14:01:40 2014 -0500 -- --
[jira] [Comment Edited] (CASSANDRA-6285) 2.0 HSHA server introduces corrupt data
[ https://issues.apache.org/jira/browse/CASSANDRA-6285?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14002181#comment-14002181 ] Brandon Williams edited comment on CASSANDRA-6285 at 5/19/14 7:04 PM: -- I committed this patch to 2.0, but did not update the disruptor jar for fear of any further regressions, so the patch Rick tested is in there. For 2.1, I committed both this patch and disruptor 0.3.5. was (Author: brandon.williams): I committed this patch to 2.0, but did not update the disruptor jar for fear of any further regressions, so the patch Rick tested in there. For 2.1, I committed both this patch and disruptor 0.3.5. 2.0 HSHA server introduces corrupt data --- Key: CASSANDRA-6285 URL: https://issues.apache.org/jira/browse/CASSANDRA-6285 Project: Cassandra Issue Type: Bug Components: Core Environment: 4 nodes, shortly updated from 1.2.11 to 2.0.2 Reporter: David Sauer Assignee: Pavel Yaskevich Priority: Critical Fix For: 2.0.8 Attachments: 6285_testnotes1.txt, CASSANDRA-6285-disruptor-heap.patch, cassandra-attack-src.zip, compaction_test.py, disruptor-high-cpu.patch, disruptor-memory-corruption.patch, enable_reallocate_buffers.txt After altering everything to LCS the table OpsCenter.rollups60 amd one other none OpsCenter-Table got stuck with everything hanging around in L0. The compaction started and ran until the logs showed this: ERROR [CompactionExecutor:111] 2013-11-01 19:14:53,865 CassandraDaemon.java (line 187) Exception in thread Thread[CompactionExecutor:111,1,RMI Runtime] java.lang.RuntimeException: Last written key DecoratedKey(1326283851463420237, 37382e34362e3132382e3139382d6a7576616c69735f6e6f72785f696e6465785f323031335f31305f30382d63616368655f646f63756d656e74736c6f6f6b75702d676574426c6f6f6d46696c746572537061636555736564) = current key DecoratedKey(954210699457429663, 37382e34362e3132382e3139382d6a7576616c69735f6e6f72785f696e6465785f323031335f31305f30382d63616368655f646f63756d656e74736c6f6f6b75702d676574546f74616c4469736b5370616365557365640b0f) writing into /var/lib/cassandra/data/OpsCenter/rollups60/OpsCenter-rollups60-tmp-jb-58656-Data.db at org.apache.cassandra.io.sstable.SSTableWriter.beforeAppend(SSTableWriter.java:141) at org.apache.cassandra.io.sstable.SSTableWriter.append(SSTableWriter.java:164) at org.apache.cassandra.db.compaction.CompactionTask.runWith(CompactionTask.java:160) at org.apache.cassandra.io.util.DiskAwareRunnable.runMayThrow(DiskAwareRunnable.java:48) at org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:28) at org.apache.cassandra.db.compaction.CompactionTask.executeInternal(CompactionTask.java:60) at org.apache.cassandra.db.compaction.AbstractCompactionTask.execute(AbstractCompactionTask.java:59) at org.apache.cassandra.db.compaction.CompactionManager$6.runMayThrow(CompactionManager.java:296) at org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:28) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:724) Moving back to STC worked to keep the compactions running. Especialy my own Table i would like to move to LCS. After a major compaction with STC the move to LCS fails with the same Exception. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Resolved] (CASSANDRA-6285) 2.0 HSHA server introduces corrupt data
[ https://issues.apache.org/jira/browse/CASSANDRA-6285?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Brandon Williams resolved CASSANDRA-6285. - Resolution: Fixed I committed this patch to 2.0, but did not update the disruptor jar for fear of any further regressions, so the patch Rick tested in there. For 2.1, I committed both this patch and disruptor 0.3.5. 2.0 HSHA server introduces corrupt data --- Key: CASSANDRA-6285 URL: https://issues.apache.org/jira/browse/CASSANDRA-6285 Project: Cassandra Issue Type: Bug Components: Core Environment: 4 nodes, shortly updated from 1.2.11 to 2.0.2 Reporter: David Sauer Assignee: Pavel Yaskevich Priority: Critical Fix For: 2.0.8 Attachments: 6285_testnotes1.txt, CASSANDRA-6285-disruptor-heap.patch, cassandra-attack-src.zip, compaction_test.py, disruptor-high-cpu.patch, disruptor-memory-corruption.patch, enable_reallocate_buffers.txt After altering everything to LCS the table OpsCenter.rollups60 amd one other none OpsCenter-Table got stuck with everything hanging around in L0. The compaction started and ran until the logs showed this: ERROR [CompactionExecutor:111] 2013-11-01 19:14:53,865 CassandraDaemon.java (line 187) Exception in thread Thread[CompactionExecutor:111,1,RMI Runtime] java.lang.RuntimeException: Last written key DecoratedKey(1326283851463420237, 37382e34362e3132382e3139382d6a7576616c69735f6e6f72785f696e6465785f323031335f31305f30382d63616368655f646f63756d656e74736c6f6f6b75702d676574426c6f6f6d46696c746572537061636555736564) = current key DecoratedKey(954210699457429663, 37382e34362e3132382e3139382d6a7576616c69735f6e6f72785f696e6465785f323031335f31305f30382d63616368655f646f63756d656e74736c6f6f6b75702d676574546f74616c4469736b5370616365557365640b0f) writing into /var/lib/cassandra/data/OpsCenter/rollups60/OpsCenter-rollups60-tmp-jb-58656-Data.db at org.apache.cassandra.io.sstable.SSTableWriter.beforeAppend(SSTableWriter.java:141) at org.apache.cassandra.io.sstable.SSTableWriter.append(SSTableWriter.java:164) at org.apache.cassandra.db.compaction.CompactionTask.runWith(CompactionTask.java:160) at org.apache.cassandra.io.util.DiskAwareRunnable.runMayThrow(DiskAwareRunnable.java:48) at org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:28) at org.apache.cassandra.db.compaction.CompactionTask.executeInternal(CompactionTask.java:60) at org.apache.cassandra.db.compaction.AbstractCompactionTask.execute(AbstractCompactionTask.java:59) at org.apache.cassandra.db.compaction.CompactionManager$6.runMayThrow(CompactionManager.java:296) at org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:28) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:724) Moving back to STC worked to keep the compactions running. Especialy my own Table i would like to move to LCS. After a major compaction with STC the move to LCS fails with the same Exception. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-6962) examine shortening path length post-5202
[
https://issues.apache.org/jira/browse/CASSANDRA-6962?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14002190#comment-14002190
]
Jonathan Ellis commented on CASSANDRA-6962:
---
bq. Looks like it was lowered across the board and not on a per-platform basis.
Yeah, nobody *really* needs keyspace names that long; not worth explaining why
your linux snapshot broke when you moved to windows if we can avoid it.
bq. On snapshots we'll be using 204 chars worst-case (48 KS, 48 CF, *2 each, 9
for snapshots, 3 for slashes) so that doesn't leave us a lot of breathing
room on path for data_file_directories.
So... review this for 3.0? It's not a ton of code.
examine shortening path length post-5202
Key: CASSANDRA-6962
URL: https://issues.apache.org/jira/browse/CASSANDRA-6962
Project: Cassandra
Issue Type: Improvement
Components: Core
Reporter: Brandon Williams
Assignee: Yuki Morishita
Fix For: 2.1 rc1
Attachments: 6962-2.1.txt
From CASSANDRA-5202 discussion:
{quote}
Did we give up on this?
Could we clean up the redundancy a little by moving the ID into the directory
name? e.g., ks/cf-uuid/version-generation-component.db
I'm worried about path length, which is limited on Windows.
Edit: to give a specific example, for KS foo Table bar we now have
/var/lib/cassandra/flush/foo/bar-2fbb89709a6911e3b7dc4d7d4e3ca4b4/foo-bar-ka-1-Data.db
I'm proposing
/var/lib/cassandra/flush/foo/bar-2fbb89709a6911e3b7dc4d7d4e3ca4b4/ka-1-Data.db
{quote}
--
This message was sent by Atlassian JIRA
(v6.2#6252)
[jira] [Created] (CASSANDRA-7267) Embedded sets in user defined data-types are not updating
Thomas Zimmer created CASSANDRA-7267:
Summary: Embedded sets in user defined data-types are not updating
Key: CASSANDRA-7267
URL: https://issues.apache.org/jira/browse/CASSANDRA-7267
Project: Cassandra
Issue Type: Bug
Components: Core
Reporter: Thomas Zimmer
Fix For: 2.1 beta2
Hi,
i just played around with Cassandra 2.1.0 beta2 and i might have found an issue
with embedded Sets in User Defined Data Types.
Here is how i can reproduce it:
1.) Create a keyspace test
2.) Create a table like this:
create table songs (title varchar PRIMARY KEY, band varchar, tags Setvarchar);
3.) Create a udt like this:
create type band_info_type (founded timestamp, members Setvarchar,
description text);
4.) Try to insert data:
insert into songs (title, band, band_info, tags) values ('The trooper', 'Iron
Maiden', {founded:188694000, members: {'Bruce Dickinson', 'Dave Murray',
'Adrian Smith', 'Janick Gers', 'Steve Harris', 'Nicko McBrain'}, description:
'Pure evil metal'}, {'metal', 'england'});
5.) Select the data:
select * from songs;
Returns this:
The trooper | Iron Maiden | {founded: '1970-01-03 05:24:54+0100', members: {},
description: 'Pure evil metal'} | {'england', 'metal'}
The embedded data-set seems to empty. I also tried updating a row which also
does not seem to work.
Regards,
Thomas
--
This message was sent by Atlassian JIRA
(v6.2#6252)
[jira] [Updated] (CASSANDRA-7209) Consider changing UDT serialization format before 2.1 release.
[ https://issues.apache.org/jira/browse/CASSANDRA-7209?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Aleksey Yeschenko updated CASSANDRA-7209: - Attachment: doc-typos.txt Attaching a patch fixing typos in the proto doc. The rest looks good to me. One nit, as mentioned before, is that we don't need to serialize the keyspace name, but even with that I can live. +1 Consider changing UDT serialization format before 2.1 release. -- Key: CASSANDRA-7209 URL: https://issues.apache.org/jira/browse/CASSANDRA-7209 Project: Cassandra Issue Type: Bug Reporter: Sylvain Lebresne Assignee: Sylvain Lebresne Fix For: 2.1 rc1 Attachments: 0001-7209.txt, 0002-Rename-column_names-types-to-field_names-types.txt, doc-typos.txt The current serialization format of UDT is the one of CompositeType. This was initially done on purpose, so that users that were using CompositeType for values in their thrift schema could migrate smoothly to UDT (it was also convenient code wise but that's a weak point). I'm having serious doubt about this being wise however for 2 reasons: * for each component, CompositeType stores an addition byte (the end-of-component) for reasons that only pertain to querying. This byte is basically wasted for UDT and makes no sense. I'll note that outside the inefficiency, there is also the fact that it will likely be pretty surprising/error-prone for driver authors. * it uses an unsigned short for the length of each component. While it's certainly not advisable in the current implementation to use values too big inside an UDT, having this limitation hard-coded in the serialization format is wrong and we've been bitten by this with collection already which we've had to fix in the protocol v3. It's probably worth no doing that mistake again. Furthermore, if we use an int for the size, we can use a negative size to represent a null value (the main point being that it's consistent with how we serialize values in the native protocol), which can be useful (CASSANDRA-7206). Of course, if we change that serialization format, we'd better do it before the 2.1 release. But I think the advantages outweigh the cons especially in the long run so I think we should do it. I'll try to work out a patch quickly so if you have a problem with the principle of this issue, it would be nice to voice it quickly. I'll note that doing that change will mean existing CompositeType values won't be able to be migrated transparently to UDT. I think this was anecdotal in the first place at best, I don't think using CompositeType for values is that popular in thrift tbh. Besides, if we really really want to, it might not be too hard to re-introduce that compatibility later by having some protocol level trick. We can't change the serialization format without breaking people however. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-6591) un-deprecate cache recentHitRate and expose in o.a.c.metrics
[ https://issues.apache.org/jira/browse/CASSANDRA-6591?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jonathan Ellis updated CASSANDRA-6591: -- Reviewer: Benedict (was: Yuki Morishita) Reassigning review to [~benedict]. Larger conversation around what to do w/ custom EH metrics vs coda? un-deprecate cache recentHitRate and expose in o.a.c.metrics Key: CASSANDRA-6591 URL: https://issues.apache.org/jira/browse/CASSANDRA-6591 Project: Cassandra Issue Type: Improvement Components: Core Reporter: Chris Burroughs Assignee: Chris Burroughs Priority: Minor Attachments: j6591-1.2-v1.txt, j6591-1.2-v2.txt, j6591-1.2-v3.txt recentHitRate metrics were not added as part of CASSANDRA-4009 because there is not an obvious way to do it with the Metrics library. Instead hitRate was added as an all time measurement since node restart. This does allow changes in cache rate (aka production performance problems) to be detected. Ideally there would be 1/5/15 moving averages for the hit rate, but I'm not sure how to calculate that. Instead I propose updating recentHitRate on a fixed interval and exposing that as a Gauge. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Reopened] (CASSANDRA-6285) 2.0 HSHA server introduces corrupt data
[ https://issues.apache.org/jira/browse/CASSANDRA-6285?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Brandon Williams reopened CASSANDRA-6285: - Oops, wait, I only changed the maven dependency. [~mishail] could you clean up the 2.1+ side of things? 2.0 HSHA server introduces corrupt data --- Key: CASSANDRA-6285 URL: https://issues.apache.org/jira/browse/CASSANDRA-6285 Project: Cassandra Issue Type: Bug Components: Core Environment: 4 nodes, shortly updated from 1.2.11 to 2.0.2 Reporter: David Sauer Assignee: Pavel Yaskevich Priority: Critical Fix For: 2.0.8 Attachments: 6285_testnotes1.txt, CASSANDRA-6285-disruptor-heap.patch, cassandra-attack-src.zip, compaction_test.py, disruptor-high-cpu.patch, disruptor-memory-corruption.patch, enable_reallocate_buffers.txt After altering everything to LCS the table OpsCenter.rollups60 amd one other none OpsCenter-Table got stuck with everything hanging around in L0. The compaction started and ran until the logs showed this: ERROR [CompactionExecutor:111] 2013-11-01 19:14:53,865 CassandraDaemon.java (line 187) Exception in thread Thread[CompactionExecutor:111,1,RMI Runtime] java.lang.RuntimeException: Last written key DecoratedKey(1326283851463420237, 37382e34362e3132382e3139382d6a7576616c69735f6e6f72785f696e6465785f323031335f31305f30382d63616368655f646f63756d656e74736c6f6f6b75702d676574426c6f6f6d46696c746572537061636555736564) = current key DecoratedKey(954210699457429663, 37382e34362e3132382e3139382d6a7576616c69735f6e6f72785f696e6465785f323031335f31305f30382d63616368655f646f63756d656e74736c6f6f6b75702d676574546f74616c4469736b5370616365557365640b0f) writing into /var/lib/cassandra/data/OpsCenter/rollups60/OpsCenter-rollups60-tmp-jb-58656-Data.db at org.apache.cassandra.io.sstable.SSTableWriter.beforeAppend(SSTableWriter.java:141) at org.apache.cassandra.io.sstable.SSTableWriter.append(SSTableWriter.java:164) at org.apache.cassandra.db.compaction.CompactionTask.runWith(CompactionTask.java:160) at org.apache.cassandra.io.util.DiskAwareRunnable.runMayThrow(DiskAwareRunnable.java:48) at org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:28) at org.apache.cassandra.db.compaction.CompactionTask.executeInternal(CompactionTask.java:60) at org.apache.cassandra.db.compaction.AbstractCompactionTask.execute(AbstractCompactionTask.java:59) at org.apache.cassandra.db.compaction.CompactionManager$6.runMayThrow(CompactionManager.java:296) at org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:28) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:724) Moving back to STC worked to keep the compactions running. Especialy my own Table i would like to move to LCS. After a major compaction with STC the move to LCS fails with the same Exception. -- This message was sent by Atlassian JIRA (v6.2#6252)
buildbot success in ASF Buildbot on cassandra-2.0
The Buildbot has detected a restored build on builder cassandra-2.0 while building cassandra. Full details are available at: http://ci.apache.org/builders/cassandra-2.0/builds/16 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: portunus_ubuntu Build Reason: scheduler Build Source Stamp: [branch cassandra-2.0] b9802ffbc4d22e5a6a608f16113d8a0d7914a319 Blamelist: Brandon Williams brandonwilli...@apache.org Build succeeded! sincerely, -The Buildbot
[jira] [Commented] (CASSANDRA-7266) Allow cqlsh shell ignore .cassandra permission errors and not fail to open the cqlsh shell.
[ https://issues.apache.org/jira/browse/CASSANDRA-7266?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14002283#comment-14002283 ] Corey Hemminger commented on CASSANDRA-7266: CQLSH should work much like the bash shell where it can display an error about not being able to access users home directory but still let you into the shell. You could even add a warning to let the users know that cqlsh history won't be saved. Allow cqlsh shell ignore .cassandra permission errors and not fail to open the cqlsh shell. --- Key: CASSANDRA-7266 URL: https://issues.apache.org/jira/browse/CASSANDRA-7266 Project: Cassandra Issue Type: Improvement Components: Tools Reporter: Carolyn Jung Priority: Minor There is an issue with home directories not working and this is causing users to not be able to execute cqlsh shell. CQLSH shell uses the .cassandra folder in the user's home directory for history and currently throws error and returns you to the prompt. Below is the error: -bash-4.1$ cqlsh Traceback (most recent call last): File /usr/bin/cqlsh, line 141, in module os.mkdir(HISTORY_DIR) OSError: [Errno 13] Permission denied: '/home/testuser/.cassandra' In this example, testuser does not have access to the home directory. Requested resolution is to allow a user to access the cqlsh shell even though the home directory is inaccessible. The current workaround is to gain access to the home directory. This is not acceptable in all cases because of security policies of the organization. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Assigned] (CASSANDRA-6146) CQL-native stress
[ https://issues.apache.org/jira/browse/CASSANDRA-6146?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] T Jake Luciani reassigned CASSANDRA-6146: - Assignee: T Jake Luciani CQL-native stress - Key: CASSANDRA-6146 URL: https://issues.apache.org/jira/browse/CASSANDRA-6146 Project: Cassandra Issue Type: New Feature Components: Tools Reporter: Jonathan Ellis Assignee: T Jake Luciani Fix For: 2.1.1 The existing CQL support in stress is not worth discussing. We need to start over, and we might as well kill two birds with one stone and move to the native protocol while we're at it. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-6146) CQL-native stress
[ https://issues.apache.org/jira/browse/CASSANDRA-6146?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] T Jake Luciani updated CASSANDRA-6146: -- Attachment: 6146.txt CQL-native stress - Key: CASSANDRA-6146 URL: https://issues.apache.org/jira/browse/CASSANDRA-6146 Project: Cassandra Issue Type: New Feature Components: Tools Reporter: Jonathan Ellis Assignee: T Jake Luciani Fix For: 2.1.1 Attachments: 6146.txt The existing CQL support in stress is not worth discussing. We need to start over, and we might as well kill two birds with one stone and move to the native protocol while we're at it. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-6146) CQL-native stress
[ https://issues.apache.org/jira/browse/CASSANDRA-6146?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] T Jake Luciani updated CASSANDRA-6146: -- Fix Version/s: (was: 2.1.1) 2.1 rc1 CQL-native stress - Key: CASSANDRA-6146 URL: https://issues.apache.org/jira/browse/CASSANDRA-6146 Project: Cassandra Issue Type: New Feature Components: Tools Reporter: Jonathan Ellis Assignee: T Jake Luciani Fix For: 2.1 rc1 Attachments: 6146.txt The existing CQL support in stress is not worth discussing. We need to start over, and we might as well kill two birds with one stone and move to the native protocol while we're at it. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7231) Support more concurrent requests per native transport connection
[ https://issues.apache.org/jira/browse/CASSANDRA-7231?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14002372#comment-14002372 ] Aleksey Yeschenko commented on CASSANDRA-7231: -- TBH, while I see merit in both options, I'm leaning towards the no-flag, version-based option slightly, now. 1. It saves us a future bit flag 2. It makes the client implementation simpler, esp. a single-version implementation 3. 'in their own time' is not really a good argument here, since there is already an equally breaking change in the v3 proto that you can't opt out from - new collections encoding format. We don't have a flag for 'extended collection size', and, logically, this shouldn't require a flag either, for consistency, if for nothing else. Separately, but related, I feel like we should make the id unsigned, or at least get rid of the whole 'negative ids reserved for the server' thing - it's wasteful and unnecessary, even when talking about 32k vs. 65k range. Support more concurrent requests per native transport connection Key: CASSANDRA-7231 URL: https://issues.apache.org/jira/browse/CASSANDRA-7231 Project: Cassandra Issue Type: Improvement Components: Core Reporter: Benedict Assignee: Sylvain Lebresne Priority: Minor Fix For: 2.1.0 Attachments: 7231.txt Right now we only support 127 concurrent requests against a given native transport connection. This causes us to waste file handles opening multiple connections, increases driver complexity and dilutes writes across multiple connections so that batching cannot easily be performed. I propose raising this limit substantially, to somewhere in the region of 16-64K, and that this is a good time to do it since we're already bumping the protocol version. -- This message was sent by Atlassian JIRA (v6.2#6252)
[1/3] git commit: Ninja: removed old cassandra-dbapi licenses. Added new one for ptyhon-driver
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 40ab77438 - 98696714f refs/heads/trunk 3f929971a - f760e1f8b Ninja: removed old cassandra-dbapi licenses. Added new one for ptyhon-driver Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/98696714 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/98696714 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/98696714 Branch: refs/heads/cassandra-2.1 Commit: 98696714fbf020ea30f07bc7066a91df725f37b8 Parents: 40ab774 Author: Mikhail Stepura mish...@apache.org Authored: Mon May 19 14:02:53 2014 -0700 Committer: Mikhail Stepura mish...@apache.org Committed: Mon May 19 14:02:53 2014 -0700 -- lib/licenses/cassandra-driver-1.0.2.txt | 177 +++ lib/licenses/cql-1.4.0.txt | 202 - lib/licenses/futures-2.1.6.txt | 21 ++ lib/licenses/thrift-python-0.9.1.txt| 324 --- 4 files changed, 198 insertions(+), 526 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/98696714/lib/licenses/cassandra-driver-1.0.2.txt -- diff --git a/lib/licenses/cassandra-driver-1.0.2.txt b/lib/licenses/cassandra-driver-1.0.2.txt new file mode 100644 index 000..f433b1a --- /dev/null +++ b/lib/licenses/cassandra-driver-1.0.2.txt @@ -0,0 +1,177 @@ + + 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
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f760e1f8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f760e1f8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f760e1f8 Branch: refs/heads/trunk Commit: f760e1f8b326482c9f73f78b37271f89be8395fd Parents: 3f92997 9869671 Author: Mikhail Stepura mish...@apache.org Authored: Mon May 19 14:03:43 2014 -0700 Committer: Mikhail Stepura mish...@apache.org Committed: Mon May 19 14:03:43 2014 -0700 -- lib/licenses/cassandra-driver-1.0.2.txt | 177 +++ lib/licenses/cql-1.4.0.txt | 202 - lib/licenses/futures-2.1.6.txt | 21 ++ lib/licenses/thrift-python-0.9.1.txt| 324 --- 4 files changed, 198 insertions(+), 526 deletions(-) --
[2/3] git commit: Ninja: removed old cassandra-dbapi licenses. Added new one for ptyhon-driver
Ninja: removed old cassandra-dbapi licenses. Added new one for ptyhon-driver Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/98696714 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/98696714 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/98696714 Branch: refs/heads/trunk Commit: 98696714fbf020ea30f07bc7066a91df725f37b8 Parents: 40ab774 Author: Mikhail Stepura mish...@apache.org Authored: Mon May 19 14:02:53 2014 -0700 Committer: Mikhail Stepura mish...@apache.org Committed: Mon May 19 14:02:53 2014 -0700 -- lib/licenses/cassandra-driver-1.0.2.txt | 177 +++ lib/licenses/cql-1.4.0.txt | 202 - lib/licenses/futures-2.1.6.txt | 21 ++ lib/licenses/thrift-python-0.9.1.txt| 324 --- 4 files changed, 198 insertions(+), 526 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/98696714/lib/licenses/cassandra-driver-1.0.2.txt -- diff --git a/lib/licenses/cassandra-driver-1.0.2.txt b/lib/licenses/cassandra-driver-1.0.2.txt new file mode 100644 index 000..f433b1a --- /dev/null +++ b/lib/licenses/cassandra-driver-1.0.2.txt @@ -0,0 +1,177 @@ + + 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
[jira] [Updated] (CASSANDRA-7216) Restricted superuser account request
[ https://issues.apache.org/jira/browse/CASSANDRA-7216?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Aleksey Yeschenko updated CASSANDRA-7216: - Attachment: 7216-POC.txt Attaching a POC-concept. Adds an overrideable AuthenticatedUser#canManageUsers(), the output of which is used to decide if the logged in user is allowed to perform ALTER USER/CREATE USER/DROP USER queries. So now you can write a custom IAuthenticator that would return an AuthenticatedUser w/ an overridden canManageUsers(), based on some config file or a hard-coded value. Coupled with automatic keyspace pre-creation and granting all the rights, I think this pretty much covers your use case. [~odpeer] [~dbros...@apache.org] wdyt? Restricted superuser account request Key: CASSANDRA-7216 URL: https://issues.apache.org/jira/browse/CASSANDRA-7216 Project: Cassandra Issue Type: Improvement Reporter: Oded Peer Assignee: Dave Brosius Priority: Minor Fix For: 3.0 Attachments: 7216-POC.txt, 7216.txt I am developing a multi-tenant service. Every tenant has its own user, keyspace and can access only his keyspace. As new tenants are provisioned there is a need to create new users and keyspaces. Only a superuser can issue CREATE USER requests, so we must have a super user account in the system. On the other hand super users have access to all the keyspaces, which poses a security risk. For tenant provisioning I would like to have a restricted account which can only create new users, without read access to keyspaces. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-7252) RingCache cannot be configured to use local DC only
[ https://issues.apache.org/jira/browse/CASSANDRA-7252?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Aleksey Yeschenko updated CASSANDRA-7252: - Fix Version/s: (was: 2.0.7) 2.0.9 RingCache cannot be configured to use local DC only --- Key: CASSANDRA-7252 URL: https://issues.apache.org/jira/browse/CASSANDRA-7252 Project: Cassandra Issue Type: Bug Components: Hadoop Reporter: Robbie Strickland Assignee: Jonathan Ellis Labels: patch Fix For: 2.0.9 Attachments: cassandra-2.0.7-7252-2.txt, cassandra-2.0.7-7252.txt RingCache always calls describe_ring, returning the entire cluster. Considering it's used in the context of writing from Hadoop (which is typically in a multi-DC configuration), this is often not desirable behavior. In some cases there may be high-latency connections between the analytics DC and other DCs. I am attaching a patch that adds an optional config value to tell RingCache to use local nodes only, in which case it calls describe_local_ring instead. It also adds helpful failed host information to IOExceptions thrown in AbstractColumnFamilyOutputFormat.createAuthenticatedClient, CqlRecordWriter, and ColumnFamilyRecordWriter. This allows a user to more easily solve related connectivity issues. -- This message was sent by Atlassian JIRA (v6.2#6252)
[2/3] git commit: Ninja: thrift-server-0.3.5.jar for CASSANDRA-6285
Ninja: thrift-server-0.3.5.jar for CASSANDRA-6285 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0f706c52 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f706c52 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f706c52 Branch: refs/heads/trunk Commit: 0f706c528e650e99bc21aa4998a051ee5603e82c Parents: 9869671 Author: Mikhail Stepura mish...@apache.org Authored: Mon May 19 14:33:19 2014 -0700 Committer: Mikhail Stepura mish...@apache.org Committed: Mon May 19 14:33:19 2014 -0700 -- build.xml | 2 +- lib/licenses/thrift-server-0.3.3.txt | 202 - lib/licenses/thrift-server-0.3.5.txt | 202 + lib/thrift-server-0.3.5.jar | Bin 0 - 39220 bytes lib/thrift-server-internal-only-0.3.3.jar | Bin 39191 - 0 bytes 5 files changed, 203 insertions(+), 203 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f706c52/build.xml -- diff --git a/build.xml b/build.xml index d7cddf6..b38f118 100644 --- a/build.xml +++ b/build.xml @@ -477,7 +477,7 @@ dependency groupId=org.mindrot artifactId=jbcrypt/ dependency groupId=com.yammer.metrics artifactId=metrics-core/ dependency groupId=com.addthis.metrics artifactId=reporter-config/ -dependency groupId=com.thinkaurelius.thrift artifactId=thrift-server version=0.3.3/ +dependency groupId=com.thinkaurelius.thrift artifactId=thrift-server version=0.3.5/ dependency groupId=com.clearspring.analytics artifactId=stream version=2.5.2 / dependency groupId=net.sf.supercsv artifactId=super-csv version=2.1.0 / http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f706c52/lib/licenses/thrift-server-0.3.3.txt -- diff --git a/lib/licenses/thrift-server-0.3.3.txt b/lib/licenses/thrift-server-0.3.3.txt deleted file mode 100644 index d645695..000 --- a/lib/licenses/thrift-server-0.3.3.txt +++ /dev/null @@ -1,202 +0,0 @@ - - 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 -
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c2cfefc5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2cfefc5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2cfefc5 Branch: refs/heads/trunk Commit: c2cfefc5072aef00b7030d922d4d29173015faad Parents: f760e1f 0f706c5 Author: Mikhail Stepura mish...@apache.org Authored: Mon May 19 14:34:04 2014 -0700 Committer: Mikhail Stepura mish...@apache.org Committed: Mon May 19 14:34:04 2014 -0700 -- build.xml | 2 +- lib/licenses/thrift-server-0.3.3.txt | 202 - lib/licenses/thrift-server-0.3.5.txt | 202 + lib/thrift-server-0.3.5.jar | Bin 0 - 39220 bytes lib/thrift-server-internal-only-0.3.3.jar | Bin 39191 - 0 bytes 5 files changed, 203 insertions(+), 203 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2cfefc5/build.xml --
[1/3] git commit: Ninja: thrift-server-0.3.5.jar for CASSANDRA-6285
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 98696714f - 0f706c528 refs/heads/trunk f760e1f8b - c2cfefc50 Ninja: thrift-server-0.3.5.jar for CASSANDRA-6285 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0f706c52 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f706c52 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f706c52 Branch: refs/heads/cassandra-2.1 Commit: 0f706c528e650e99bc21aa4998a051ee5603e82c Parents: 9869671 Author: Mikhail Stepura mish...@apache.org Authored: Mon May 19 14:33:19 2014 -0700 Committer: Mikhail Stepura mish...@apache.org Committed: Mon May 19 14:33:19 2014 -0700 -- build.xml | 2 +- lib/licenses/thrift-server-0.3.3.txt | 202 - lib/licenses/thrift-server-0.3.5.txt | 202 + lib/thrift-server-0.3.5.jar | Bin 0 - 39220 bytes lib/thrift-server-internal-only-0.3.3.jar | Bin 39191 - 0 bytes 5 files changed, 203 insertions(+), 203 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f706c52/build.xml -- diff --git a/build.xml b/build.xml index d7cddf6..b38f118 100644 --- a/build.xml +++ b/build.xml @@ -477,7 +477,7 @@ dependency groupId=org.mindrot artifactId=jbcrypt/ dependency groupId=com.yammer.metrics artifactId=metrics-core/ dependency groupId=com.addthis.metrics artifactId=reporter-config/ -dependency groupId=com.thinkaurelius.thrift artifactId=thrift-server version=0.3.3/ +dependency groupId=com.thinkaurelius.thrift artifactId=thrift-server version=0.3.5/ dependency groupId=com.clearspring.analytics artifactId=stream version=2.5.2 / dependency groupId=net.sf.supercsv artifactId=super-csv version=2.1.0 / http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f706c52/lib/licenses/thrift-server-0.3.3.txt -- diff --git a/lib/licenses/thrift-server-0.3.3.txt b/lib/licenses/thrift-server-0.3.3.txt deleted file mode 100644 index d645695..000 --- a/lib/licenses/thrift-server-0.3.3.txt +++ /dev/null @@ -1,202 +0,0 @@ - - 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
[jira] [Commented] (CASSANDRA-6285) 2.0 HSHA server introduces corrupt data
[ https://issues.apache.org/jira/browse/CASSANDRA-6285?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14002440#comment-14002440 ] Mikhail Stepura commented on CASSANDRA-6285: [~brandon.williams] done. 2.0 HSHA server introduces corrupt data --- Key: CASSANDRA-6285 URL: https://issues.apache.org/jira/browse/CASSANDRA-6285 Project: Cassandra Issue Type: Bug Components: Core Environment: 4 nodes, shortly updated from 1.2.11 to 2.0.2 Reporter: David Sauer Assignee: Pavel Yaskevich Priority: Critical Fix For: 2.0.8 Attachments: 6285_testnotes1.txt, CASSANDRA-6285-disruptor-heap.patch, cassandra-attack-src.zip, compaction_test.py, disruptor-high-cpu.patch, disruptor-memory-corruption.patch, enable_reallocate_buffers.txt After altering everything to LCS the table OpsCenter.rollups60 amd one other none OpsCenter-Table got stuck with everything hanging around in L0. The compaction started and ran until the logs showed this: ERROR [CompactionExecutor:111] 2013-11-01 19:14:53,865 CassandraDaemon.java (line 187) Exception in thread Thread[CompactionExecutor:111,1,RMI Runtime] java.lang.RuntimeException: Last written key DecoratedKey(1326283851463420237, 37382e34362e3132382e3139382d6a7576616c69735f6e6f72785f696e6465785f323031335f31305f30382d63616368655f646f63756d656e74736c6f6f6b75702d676574426c6f6f6d46696c746572537061636555736564) = current key DecoratedKey(954210699457429663, 37382e34362e3132382e3139382d6a7576616c69735f6e6f72785f696e6465785f323031335f31305f30382d63616368655f646f63756d656e74736c6f6f6b75702d676574546f74616c4469736b5370616365557365640b0f) writing into /var/lib/cassandra/data/OpsCenter/rollups60/OpsCenter-rollups60-tmp-jb-58656-Data.db at org.apache.cassandra.io.sstable.SSTableWriter.beforeAppend(SSTableWriter.java:141) at org.apache.cassandra.io.sstable.SSTableWriter.append(SSTableWriter.java:164) at org.apache.cassandra.db.compaction.CompactionTask.runWith(CompactionTask.java:160) at org.apache.cassandra.io.util.DiskAwareRunnable.runMayThrow(DiskAwareRunnable.java:48) at org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:28) at org.apache.cassandra.db.compaction.CompactionTask.executeInternal(CompactionTask.java:60) at org.apache.cassandra.db.compaction.AbstractCompactionTask.execute(AbstractCompactionTask.java:59) at org.apache.cassandra.db.compaction.CompactionManager$6.runMayThrow(CompactionManager.java:296) at org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:28) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:724) Moving back to STC worked to keep the compactions running. Especialy my own Table i would like to move to LCS. After a major compaction with STC the move to LCS fails with the same Exception. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Resolved] (CASSANDRA-6285) 2.0 HSHA server introduces corrupt data
[ https://issues.apache.org/jira/browse/CASSANDRA-6285?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Brandon Williams resolved CASSANDRA-6285. - Resolution: Fixed Thanks. 2.0 HSHA server introduces corrupt data --- Key: CASSANDRA-6285 URL: https://issues.apache.org/jira/browse/CASSANDRA-6285 Project: Cassandra Issue Type: Bug Components: Core Environment: 4 nodes, shortly updated from 1.2.11 to 2.0.2 Reporter: David Sauer Assignee: Pavel Yaskevich Priority: Critical Fix For: 2.0.8 Attachments: 6285_testnotes1.txt, CASSANDRA-6285-disruptor-heap.patch, cassandra-attack-src.zip, compaction_test.py, disruptor-high-cpu.patch, disruptor-memory-corruption.patch, enable_reallocate_buffers.txt After altering everything to LCS the table OpsCenter.rollups60 amd one other none OpsCenter-Table got stuck with everything hanging around in L0. The compaction started and ran until the logs showed this: ERROR [CompactionExecutor:111] 2013-11-01 19:14:53,865 CassandraDaemon.java (line 187) Exception in thread Thread[CompactionExecutor:111,1,RMI Runtime] java.lang.RuntimeException: Last written key DecoratedKey(1326283851463420237, 37382e34362e3132382e3139382d6a7576616c69735f6e6f72785f696e6465785f323031335f31305f30382d63616368655f646f63756d656e74736c6f6f6b75702d676574426c6f6f6d46696c746572537061636555736564) = current key DecoratedKey(954210699457429663, 37382e34362e3132382e3139382d6a7576616c69735f6e6f72785f696e6465785f323031335f31305f30382d63616368655f646f63756d656e74736c6f6f6b75702d676574546f74616c4469736b5370616365557365640b0f) writing into /var/lib/cassandra/data/OpsCenter/rollups60/OpsCenter-rollups60-tmp-jb-58656-Data.db at org.apache.cassandra.io.sstable.SSTableWriter.beforeAppend(SSTableWriter.java:141) at org.apache.cassandra.io.sstable.SSTableWriter.append(SSTableWriter.java:164) at org.apache.cassandra.db.compaction.CompactionTask.runWith(CompactionTask.java:160) at org.apache.cassandra.io.util.DiskAwareRunnable.runMayThrow(DiskAwareRunnable.java:48) at org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:28) at org.apache.cassandra.db.compaction.CompactionTask.executeInternal(CompactionTask.java:60) at org.apache.cassandra.db.compaction.AbstractCompactionTask.execute(AbstractCompactionTask.java:59) at org.apache.cassandra.db.compaction.CompactionManager$6.runMayThrow(CompactionManager.java:296) at org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:28) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:724) Moving back to STC worked to keep the compactions running. Especialy my own Table i would like to move to LCS. After a major compaction with STC the move to LCS fails with the same Exception. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-6454) Pig support for hadoop CqlInputFormat
[ https://issues.apache.org/jira/browse/CASSANDRA-6454?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Alex Liu updated CASSANDRA-6454: Attachment: 6454-v2-2.0-branch.txt Pig support for hadoop CqlInputFormat - Key: CASSANDRA-6454 URL: https://issues.apache.org/jira/browse/CASSANDRA-6454 Project: Cassandra Issue Type: Bug Components: Hadoop Reporter: Alex Liu Assignee: Alex Liu Fix For: 2.0.9 Attachments: 6454-2.0-branch.txt, 6454-v2-2.0-branch.txt CASSANDRA-6311 adds new CqlInputFormat, we need add the Pig support for it -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-6454) Pig support for hadoop CqlInputFormat
[ https://issues.apache.org/jira/browse/CASSANDRA-6454?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Alex Liu updated CASSANDRA-6454: Attachment: (was: 6454-v2-2.0-branch.txt) Pig support for hadoop CqlInputFormat - Key: CASSANDRA-6454 URL: https://issues.apache.org/jira/browse/CASSANDRA-6454 Project: Cassandra Issue Type: Bug Components: Hadoop Reporter: Alex Liu Assignee: Alex Liu Fix For: 2.0.9 Attachments: 6454-2.0-branch.txt, 6454-v2-2.0-branch.txt CASSANDRA-6311 adds new CqlInputFormat, we need add the Pig support for it -- This message was sent by Atlassian JIRA (v6.2#6252)
