Production fixes

CHANGELOG.md

@@ -1,3 +1,44 @@
+# Changelog
+
+## 2018/02/01: 3.11.17
+
+### New Features
+* (#639) bakup.status is now a variable
+* (#647) SDB clients standardized
+
+### Bugs
+* (#658) Autostart functionality now uses timers instead of ratelimiters so that
+  the first autostart does not start until an interval after the first start.
+* (#632) Duplicate slf4j bindings excluded
+* (#643) Gracefully shut down quartz
+
+## 2017/12/14: 3.11.16
+
+### Bugs
+* Gradle 4.4 Support
+* Autostart functionality now only sets shouldCassandraBeAlive flag from
+  the start api to prevent a race against the stop API in the monitoring
+  thread.
+
+## 2017/12/06: 3.11.15
+
+### Bugs
+* None
+
+### New Features
+* Priam will now automatically restart Cassandra if it fails. If you use
+  Priam to stop Cassandra (via the API) it will not automatically restart
+  Cassandra until a subsequent start via the API. You can control this
+  via the ``priam.remediate.dead.cassandra.rate`` configuration option. If
+  negative it disables auto-remediation, if zero it immediately auto-remediates
+  on any failure, and if a positive integer the auto-remediation waits for
+  that number of seconds between restarts. The default is 360 seconds
+  (one hour).
+
+### Breaking Changes
+* None
+
+## Previous changelog
 1.1
 - Support for cassandra 1.1
 - Support to publish cassandra metrics (TODO)

README.md

@@ -2,6 +2,8 @@
 
 [![Build Status](https://travis-ci.org/Netflix/Priam.svg?branch=3.x)](https://travis-ci.org/Netflix/Priam)
 
+### Priam 3.11 branch supports Cassandra 3.11.x and 3.11+ 
+
 Priam is a process/tool that runs alongside Apache Cassandra to automate the following:
 - Backup and recovery (Complete and incremental)
 - Token management

build.gradle

@@ -1,41 +1,44 @@
 plugins {
-    id 'nebula.netflixoss' version '3.6.4'
-    id 'nebula.provided-base' version '3.0.3'
+    id 'nebula.netflixoss' version '5.0.0'
 }
 
-ext.githubProjectName = 'Priam'
+ext.githubProjectName = 'Priam-parent'
 
-subprojects {
+allprojects {
     apply plugin: 'nebula.netflixoss'
     apply plugin: 'java'
-    apply plugin: 'nebula.provided-base'
 
     group = 'com.netflix.priam'
 
     repositories {
         jcenter()
     }
+
+    configurations {
+      all*.exclude group: 'ch.qos.logback', module: 'logback-classic'
+      all*.exclude group: 'ch.qos.logback', module: 'logback-core'
+    }
 
     dependencies {
       compile 'org.apache.commons:commons-lang3:3.5'
       compile 'commons-logging:commons-logging:1.2'
       compile 'org.apache.commons:commons-collections4:4.1'
-      compile 'commons-io:commons-io:2.5'
+      compile 'commons-io:commons-io:2.6'
       compile 'commons-cli:commons-cli:1.4'
       compile 'commons-httpclient:commons-httpclient:3.1'
-      compile 'com.sun.jersey.contribs:jersey-multipart:1.19.3'
-      compile 'com.sun.jersey:jersey-json:1.19.3'
+      compile 'com.sun.jersey.contribs:jersey-multipart:1.19.4'
+      compile 'com.sun.jersey:jersey-json:1.19.4'
+      compile 'com.sun.jersey:jersey-bundle:1.19.4'
+      compile 'com.sun.jersey.contribs:jersey-guice:1.19.4'
       compile 'com.google.guava:guava:21.0'
       compile 'com.google.code.findbugs:jsr305:3.0.2'
-      compile 'com.amazonaws:aws-java-sdk:1.11.126'
+      compile 'com.amazonaws:aws-java-sdk:1.11.264'
       compile 'com.google.inject:guice:4.1.0'
-      compile 'com.sun.jersey:jersey-bundle:1.19.3'
-      compile 'com.sun.jersey.contribs:jersey-guice:1.19.3'
       compile 'com.google.inject.extensions:guice-servlet:4.1.0'
       compile 'org.quartz-scheduler:quartz:2.2.3'
       compile 'com.googlecode.json-simple:json-simple:1.1.1'
       compile 'org.xerial.snappy:snappy-java:1.1.2.6'
-      compile 'org.yaml:snakeyaml:1.18'
+      compile 'org.yaml:snakeyaml:1.19'
       compile 'org.apache.cassandra:cassandra-all:2.1.17'
       compile 'javax.ws.rs:jsr311-api:1.1.1'
       compile 'joda-time:joda-time:2.9.9'
@@ -45,24 +48,22 @@ subprojects {
       compile 'org.apache.httpcomponents:httpclient:4.5.3'
       compile 'org.apache.httpcomponents:httpcore:4.4.6'
       compile 'com.ning:compress-lzf:1.0.4'
+      compile 'com.google.code.gson:gson:2.8.2'
       compile 'org.slf4j:slf4j-api:1.7.25'
       compile 'org.slf4j:slf4j-log4j12:1.7.25'
       compile 'org.bouncycastle:bcprov-jdk16:1.46'
       compile 'org.bouncycastle:bcpg-jdk16:1.46'
-      compile ('com.google.appengine.tools:appengine-gcs-client:0.6') {
+      compile ('com.google.appengine.tools:appengine-gcs-client:0.7') {
           exclude module: 'guava'
       }
       compile 'com.google.apis:google-api-services-storage:v1-rev100-1.22.0'
       compile 'com.google.http-client:google-http-client-jackson2:1.22.0'
-      provided 'javax.servlet:javax.servlet-api:3.1.0'
+      compileOnly 'javax.servlet:javax.servlet-api:3.1.0'
       testCompile 'org.jmockit:jmockit:1.31'
       testCompile "org.spockframework:spock-core:1.1-groovy-2.4"
       testCompile 'junit:junit:4.12'
-      //testCompile 'mockit:mockit:0.999'
-    }
-
-    compileJava {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
     }
+
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Jun 08 10:17:17 PDT 2017
+#Thu Jun 29 13:18:34 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

priam-cass-extensions/src/main/java/com/netflix/priam/cassandra/extensions/DataFetcher.java

@@ -1,17 +1,18 @@
-/**
+/*
  * Copyright 2013 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 package com.netflix.priam.cassandra.extensions;
 
@@ -48,7 +49,7 @@ public static String fetchData(String url)
             while ((c = responseStream.read(b, 0, b.length)) != -1)
                 bos.write(b, 0, c);
             String return_ = new String(bos.toByteArray(), Charsets.UTF_8);
-            logger.info(String.format("Calling URL API: %s returns: %s", url, return_));
+            logger.info("Calling URL API: {} returns: {}", url, return_);
             conn.disconnect();
             return return_;
         }

priam-cass-extensions/src/main/java/com/netflix/priam/cassandra/extensions/NFSeedProvider.java

@@ -1,17 +1,18 @@
-/**
+/*
  * Copyright 2013 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 package com.netflix.priam.cassandra.extensions;
 

priam-cass-extensions/src/main/java/com/netflix/priam/cassandra/extensions/PriamStartupAgent.java

@@ -1,17 +1,18 @@
-/**
+/*
  * Copyright 2013 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 package com.netflix.priam.cassandra.extensions;
 

priam-web/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-  id 'jetty'
+    id 'org.akhikhl.gretty' version '1.4.2'
 }
 
 apply plugin: 'war'

priam/build.gradle

@@ -0,0 +1 @@
+apply plugin: 'groovy'