|
|
|
|
@ -1,6 +1,6 @@
|
|
|
|
|
Index: bin/cassandra.in.sh
|
|
|
|
|
--- bin/cassandra.in.sh.orig 2017-10-02 19:23:28.000000000 +0200
|
|
|
|
|
+++ bin/cassandra.in.sh 2017-11-06 21:29:14.162114000 +0100
|
|
|
|
|
--- bin/cassandra.in.sh.orig 2020-02-10 23:57:55.000000000 +0100
|
|
|
|
|
+++ bin/cassandra.in.sh 2020-02-15 22:53:08.864493000 +0100
|
|
|
|
|
@@ -15,19 +15,19 @@
|
|
|
|
|
# limitations under the License.
|
|
|
|
|
|
|
|
|
|
@ -38,8 +38,8 @@ Index: bin/cassandra.in.sh
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
Index: bin/cqlsh
|
|
|
|
|
--- bin/cqlsh.orig 2017-10-02 19:23:28.000000000 +0200
|
|
|
|
|
+++ bin/cqlsh 2017-11-06 21:29:14.162291000 +0100
|
|
|
|
|
--- bin/cqlsh.orig 2020-02-10 23:57:55.000000000 +0100
|
|
|
|
|
+++ bin/cqlsh 2020-02-15 22:53:08.864633000 +0100
|
|
|
|
|
@@ -17,8 +17,8 @@
|
|
|
|
|
|
|
|
|
|
# bash code here; finds a suitable python interpreter and execs this file.
|
|
|
|
|
@ -52,8 +52,8 @@ Index: bin/cqlsh
|
|
|
|
|
which python$pyver > /dev/null 2>&1 && exec python$pyver "`python$pyver -c "import os;print(os.path.dirname(os.path.realpath('$0')))"`/cqlsh.py" "$@"
|
|
|
|
|
done
|
|
|
|
|
Index: cassandra-driver-3.14.0/cassandra/io/libevwrapper.c
|
|
|
|
|
--- cassandra-driver-3.14.0/cassandra/io/libevwrapper.c.orig 2017-09-06 00:13:41.000000000 +0200
|
|
|
|
|
+++ cassandra-driver-3.14.0/cassandra/io/libevwrapper.c 2017-11-06 21:29:14.162554000 +0100
|
|
|
|
|
--- cassandra-driver-3.14.0/cassandra/io/libevwrapper.c.orig 2018-04-02 22:03:29.000000000 +0200
|
|
|
|
|
+++ cassandra-driver-3.14.0/cassandra/io/libevwrapper.c 2020-02-15 22:53:08.864820000 +0100
|
|
|
|
|
@@ -1,5 +1,5 @@
|
|
|
|
|
#include <Python.h>
|
|
|
|
|
-#include <ev.h>
|
|
|
|
|
@ -62,8 +62,8 @@ Index: cassandra-driver-3.14.0/cassandra/io/libevwrapper.c
|
|
|
|
|
typedef struct libevwrapper_Loop {
|
|
|
|
|
PyObject_HEAD
|
|
|
|
|
Index: cassandra-driver-3.14.0/setup.py
|
|
|
|
|
--- cassandra-driver-3.14.0/setup.py.orig 2017-10-24 22:27:37.000000000 +0200
|
|
|
|
|
+++ cassandra-driver-3.14.0/setup.py 2017-11-06 21:30:15.886233000 +0100
|
|
|
|
|
--- cassandra-driver-3.14.0/setup.py.orig 2018-04-16 19:16:38.000000000 +0200
|
|
|
|
|
+++ cassandra-driver-3.14.0/setup.py 2020-02-15 22:53:08.864977000 +0100
|
|
|
|
|
@@ -146,9 +146,9 @@
|
|
|
|
|
|
|
|
|
|
libev_ext = Extension('cassandra.io.libevwrapper',
|
|
|
|
|
@ -86,18 +86,18 @@ Index: cassandra-driver-3.14.0/setup.py
|
|
|
|
|
if user_specified_cython_version is not None:
|
|
|
|
|
cython_dep = 'Cython==%s' % (user_specified_cython_version,)
|
|
|
|
|
Index: conf/cassandra-env.sh
|
|
|
|
|
--- conf/cassandra-env.sh.orig 2017-10-02 19:23:28.000000000 +0200
|
|
|
|
|
+++ conf/cassandra-env.sh 2017-11-06 21:29:14.163129000 +0100
|
|
|
|
|
@@ -122,7 +122,7 @@
|
|
|
|
|
esac
|
|
|
|
|
--- conf/cassandra-env.sh.orig 2020-02-10 23:57:55.000000000 +0100
|
|
|
|
|
+++ conf/cassandra-env.sh 2020-02-15 22:53:46.416494000 +0100
|
|
|
|
|
@@ -127,7 +127,7 @@
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
#GC log path has to be defined here because it needs to access CASSANDRA_HOME
|
|
|
|
|
-JVM_OPTS="$JVM_OPTS -Xloggc:${CASSANDRA_HOME}/logs/gc.log"
|
|
|
|
|
-JVM_OPTS="$JVM_OPTS -Xloggc:${CASSANDRA_LOG_DIR}/gc.log"
|
|
|
|
|
+JVM_OPTS="$JVM_OPTS -Xloggc:${CASSANDRA_HOME}/var/cassandra/log/cassandra.gc.log"
|
|
|
|
|
|
|
|
|
|
# Here we create the arguments that will get passed to the jvm when
|
|
|
|
|
# starting cassandra.
|
|
|
|
|
@@ -207,7 +207,7 @@
|
|
|
|
|
@@ -212,7 +212,7 @@
|
|
|
|
|
JVM_OPTS="$JVM_OPTS -XX:CompileCommandFile=$CASSANDRA_CONF/hotspot_compiler"
|
|
|
|
|
|
|
|
|
|
# add the jamm javaagent
|
|
|
|
|
@ -107,8 +107,8 @@ Index: conf/cassandra-env.sh
|
|
|
|
|
# set jvm HeapDumpPath with CASSANDRA_HEAPDUMP_DIR
|
|
|
|
|
if [ "x$CASSANDRA_HEAPDUMP_DIR" != "x" ]; then
|
|
|
|
|
Index: conf/cassandra.yaml
|
|
|
|
|
--- conf/cassandra.yaml.orig 2017-10-02 19:23:28.000000000 +0200
|
|
|
|
|
+++ conf/cassandra.yaml 2017-11-06 21:29:14.163557000 +0100
|
|
|
|
|
--- conf/cassandra.yaml.orig 2020-02-10 23:57:55.000000000 +0100
|
|
|
|
|
+++ conf/cassandra.yaml 2020-02-15 22:53:08.865467000 +0100
|
|
|
|
|
@@ -71,6 +71,7 @@
|
|
|
|
|
# Directory where Cassandra should store hints.
|
|
|
|
|
# If not set, the default directory is $CASSANDRA_HOME/data/hints.
|
|
|
|
|
@ -144,8 +144,8 @@ Index: conf/cassandra.yaml
|
|
|
|
|
# commitlog_sync may be either "periodic" or "batch."
|
|
|
|
|
#
|
|
|
|
|
Index: conf/logback.xml
|
|
|
|
|
--- conf/logback.xml.orig 2017-10-02 19:23:28.000000000 +0200
|
|
|
|
|
+++ conf/logback.xml 2017-11-06 21:29:14.163744000 +0100
|
|
|
|
|
--- conf/logback.xml.orig 2020-02-10 23:57:55.000000000 +0100
|
|
|
|
|
+++ conf/logback.xml 2020-02-15 22:53:08.865602000 +0100
|
|
|
|
|
@@ -33,9 +33,9 @@
|
|
|
|
|
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
|
|
|
|
|
<level>INFO</level>
|
|
|
|
|
|
