Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bc30a6f7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc30a6f7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc30a6f7 Branch: refs/heads/cassandra-3.11 Commit: bc30a6f733545205271a2cdf82cfa7ab42eee6f4 Parents: dd9ae1d 9d498dc Author: Mick Semb Wever <m...@apache.org> Authored: Fri May 4 14:47:10 2018 +1000 Committer: Mick Semb Wever <m...@apache.org> Committed: Fri May 4 15:01:54 2018 +1000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/cache/AutoSavingCache.java | 3 +- .../cassandra/db/compaction/CompactionInfo.java | 33 +++++++++++++++++--- .../apache/cassandra/db/view/ViewBuilder.java | 19 ++++++----- .../io/sstable/IndexSummaryRedistribution.java | 5 +-- .../tools/nodetool/CompactionStats.java | 7 +++-- 6 files changed, 48 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc30a6f7/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 2d7053d,f1dcf52..5f66b62 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,5 +1,16 @@@ -3.0.17 +3.11.3 + * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851) + * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299) + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370) + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891) + * Serialize empty buffer as empty string for json output format (CASSANDRA-14245) + * Allow logging implementation to be interchanged for embedded testing (CASSANDRA-13396) + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247) + * Fix Loss of digits when doing CAST from varint/bigint to decimal (CASSANDRA-14170) + * RateBasedBackPressure unnecessarily invokes a lock on the Guava RateLimiter (CASSANDRA-14163) + * Fix wildcard GROUP BY queries (CASSANDRA-14209) +Merged from 3.0: + * Fix progress stats and units in compactionstats (CASSANDRA-12244) * Better handle missing partition columns in system_schema.columns (CASSANDRA-14379) * Delay hints store excise by write timeout to avoid race with decommission (CASSANDRA-13740) * Deprecate background repair and probablistic read_repair_chance table options http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc30a6f7/src/java/org/apache/cassandra/cache/AutoSavingCache.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/cache/AutoSavingCache.java index aa13ca3,00431b9..a40a8a9 --- a/src/java/org/apache/cassandra/cache/AutoSavingCache.java +++ b/src/java/org/apache/cassandra/cache/AutoSavingCache.java @@@ -42,9 -41,11 +42,10 @@@ import org.apache.cassandra.db.ColumnFa import org.apache.cassandra.db.compaction.CompactionInfo; import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.compaction.OperationType; + import org.apache.cassandra.db.compaction.CompactionInfo.Unit; import org.apache.cassandra.io.FSWriteError; import org.apache.cassandra.io.util.*; -import org.apache.cassandra.io.util.ChecksummedRandomAccessReader.CorruptFileException; +import org.apache.cassandra.io.util.CorruptFileException; import org.apache.cassandra.io.util.DataInputPlus.DataInputStreamPlus; import org.apache.cassandra.service.CacheService; import org.apache.cassandra.utils.JVMStabilityInspector; http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc30a6f7/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc30a6f7/src/java/org/apache/cassandra/db/view/ViewBuilder.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/view/ViewBuilder.java index 8e647ea,68cb265..d9c9e71 --- a/src/java/org/apache/cassandra/db/view/ViewBuilder.java +++ b/src/java/org/apache/cassandra/db/view/ViewBuilder.java @@@ -190,25 -188,9 +193,25 @@@ public class ViewBuilder extends Compac } } + private void updateDistributed(String ksname, String viewName, UUID localHostId) + { + try + { + SystemDistributedKeyspace.successfulViewBuild(ksname, viewName, localHostId); + SystemKeyspace.setViewBuiltReplicated(ksname, viewName); + } + catch (Exception e) + { + ScheduledExecutors.nonPeriodicTasks.schedule(() -> CompactionManager.instance.submitViewBuilder(this), + 5, + TimeUnit.MINUTES); + logger.warn("Failed to updated the distributed status of view, sleeping 5 minutes before retrying", e); + } + } + public CompactionInfo getCompactionInfo() { - long rangesLeft = 0, rangesTotal = 0; + long rangesCompleted = 0, rangesTotal = 0; Token lastToken = prevToken; // This approximation is not very accurate, but since we do not have a method which allows us to calculate the http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc30a6f7/src/java/org/apache/cassandra/io/sstable/IndexSummaryRedistribution.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/io/sstable/IndexSummaryRedistribution.java index 73626d3,ff362e8..ab23ef3 --- a/src/java/org/apache/cassandra/io/sstable/IndexSummaryRedistribution.java +++ b/src/java/org/apache/cassandra/io/sstable/IndexSummaryRedistribution.java @@@ -38,9 -38,9 +38,10 @@@ import org.apache.cassandra.db.Keyspace import org.apache.cassandra.db.compaction.CompactionInfo; import org.apache.cassandra.db.compaction.CompactionInterruptedException; import org.apache.cassandra.db.compaction.OperationType; + import org.apache.cassandra.db.compaction.CompactionInfo.Unit; import org.apache.cassandra.db.lifecycle.LifecycleTransaction; import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.concurrent.Refs; http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc30a6f7/src/java/org/apache/cassandra/tools/nodetool/CompactionStats.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/tools/nodetool/CompactionStats.java index 4fd0423,36b5733..d615516 --- a/src/java/org/apache/cassandra/tools/nodetool/CompactionStats.java +++ b/src/java/org/apache/cassandra/tools/nodetool/CompactionStats.java @@@ -17,16 -17,19 +17,18 @@@ */ package org.apache.cassandra.tools.nodetool; -import static java.lang.String.format; -import io.airlift.command.Command; -import io.airlift.command.Option; - import java.text.DecimalFormat; -import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Map.Entry; + +import io.airlift.command.Command; +import io.airlift.command.Option; + import org.apache.cassandra.db.compaction.CompactionInfo; import org.apache.cassandra.db.compaction.CompactionManagerMBean; import org.apache.cassandra.db.compaction.OperationType; + import org.apache.cassandra.db.compaction.CompactionInfo.Unit; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; @@@ -85,12 -63,13 +87,13 @@@ public class CompactionStats extends No String taskType = c.get("taskType"); String keyspace = c.get("keyspace"); String columnFamily = c.get("columnfamily"); - String completedStr = humanReadable ? FileUtils.stringifyFileSize(completed) : Long.toString(completed); - String totalStr = humanReadable ? FileUtils.stringifyFileSize(total) : Long.toString(total); String unit = c.get("unit"); + boolean toFileSize = humanReadable && Unit.isFileSize(unit); + String completedStr = toFileSize ? FileUtils.stringifyFileSize(completed) : Long.toString(completed); + String totalStr = toFileSize ? FileUtils.stringifyFileSize(total) : Long.toString(total); String percentComplete = total == 0 ? "n/a" : new DecimalFormat("0.00").format((double) completed / total * 100) + "%"; String id = c.get("compactionId"); - addLine(lines, columnSizes, id, taskType, keyspace, columnFamily, completedStr, totalStr, unit, percentComplete); + table.add(id, taskType, keyspace, columnFamily, completedStr, totalStr, unit, percentComplete); if (taskType.equals(OperationType.COMPACTION.toString())) remainingBytes += total - completed; } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
