Merge 3.x (Cassandra 2.x) branch to master #720
+20,062
−13,460
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… accounts for existence of yaml file
Removal of yaml entries not applicable to Cassandra 2.1
…ace(s) and/or CFs from incremental. Exclusion keyspace(s) and/or CFs from restore.
…e src file is left. This commit cleans up src file properly
Exclusion of keyspace(s) and/or CFs from snapshot. Exclusion of keyspace(s) and/or CFs from incremental. Exclusion keyspace(s) and/or CFs from restore.
…bility on the state of a current restore.
…sion of jdk. Also, refactor tests to account for new restore
…uest from Cassandra itself and other clients is the REST api
1. Allow visibility on the state of a current restore 2. Upgrade tests to use JMockit 1.19 3. Properly log a client asks for a token value
Provide ability to force JMX connection between Priam and Cassandra
minimize verbose logging
…ion) to the jxm connection to Cassandra
Allow for interested parties to be aware of changes (e.g. new connection) to the jxm connection to Cassandra
Filter of META for listing of files will not account incremental meta data file
1. Optional incremental backup parallization 2. Updated Bintray API key from master
Determine status of a snapshot for a date
…load 2. Allow regex for exclusion of keyspace(s) and/or CFs filters
1. Eliminate unneccessargy injection for parallization incremental up load 2. Allow regex for exclusion of keyspace(s) and/or CFs filters
…vironment for" without enabling it (i.e. did not merge AWSMembership.java, and PriamConfiguration.java
Merge of 3.x-vpc "A means to manipulate ACL within classic, or vpc environment for" without enabling it (i.e. did not merge AWSMembership.java, and PriamConfiguration.java
Enabling manipulation of ACL within classic, or vpc environment
…at is 3 years old
Mark snapshot as failure if there is any issue in uploading a file.
Adding post restore hook as part of restore process, that gets executed once files are restored on the instance, before starting C*.
…x#683) * Changing info to debug (redundant) logs, and adding postrestorehook command to the log statement * Changes to changelog.md for this and previous release
…Tool command (Netflix#685) Extend StandardTuner to allow custom yaml properties, generic JMXNodeTool command
…storehook pull request (Netflix#688)
# Conflicts: # priam/src/main/java/com/netflix/priam/backup/AbstractBackup.java # priam/src/main/java/com/netflix/priam/resources/CassandraAdmin.java # priam/src/test/java/com/netflix/priam/FakeConfiguration.java
* Moving declaration of restore-finished status to, after PostRestoreHook execution * Adding changlog entry for restore-finished status update position
…hould move this logic to IClusterManagement to ensure flush gets the exclude cf as well.
# Conflicts: # priam/src/main/java/com/netflix/priam/restore/AbstractRestore.java
changelog update and use netflixoss 5.1.1.
…ncy configurable (Netflix#703)
* Consolidation of the cron timer code from various places. Make it more standard. * deprecation of flush hour and snapshot hour * change of default value to disable flush cron from "null" to "-1" * Remove unused imports * Correct typos * Minor code cleanup * Minor code changes * Change redundant access modifiers * Remove redundant bindings * Remove unnecessary access modifiers. * Make default bindings using ImplementBy
1. Initial commit for backup version 2.0 2. SNS notifications can have attributes.
* Move to the spectator to collect metrics. Default binding is to NoopRegistry. Refer to https://github.com/Netflix/spectator for more details.
Move to spectator to collect metrics. Default binding is to NoopRegistry. Refer to https://github.com/Netflix/spectator for more details.
…n C* data folder.
# Conflicts: # .travis.yml # CHANGELOG.md # README.md # build.gradle # buildViaTravis.sh # gradle.properties # gradle/convention.gradle # gradle/release.gradle # gradle/wrapper/gradle-wrapper.jar # gradle/wrapper/gradle-wrapper.properties # gradlew # priam-dse-extensions/build.gradle # priam-web/build.gradle # priam/build.gradle # priam/src/main/java/com/netflix/priam/IConfiguration.java # priam/src/main/java/com/netflix/priam/PriamServer.java # priam/src/main/java/com/netflix/priam/aws/AWSMembership.java # priam/src/main/java/com/netflix/priam/aws/S3CrossAccountFileSystem.java # priam/src/main/java/com/netflix/priam/aws/S3EncryptedFileSystem.java # priam/src/main/java/com/netflix/priam/aws/S3EncryptedFileSystemMBean.java # priam/src/main/java/com/netflix/priam/aws/S3FileSystem.java # priam/src/main/java/com/netflix/priam/aws/S3FileSystemBase.java # priam/src/main/java/com/netflix/priam/aws/S3PrefixIterator.java # priam/src/main/java/com/netflix/priam/aws/SDBInstanceFactory.java # priam/src/main/java/com/netflix/priam/aws/UpdateSecuritySettings.java # priam/src/main/java/com/netflix/priam/aws/auth/IS3Credential.java # priam/src/main/java/com/netflix/priam/aws/auth/S3InstanceCredential.java # priam/src/main/java/com/netflix/priam/aws/auth/S3RoleAssumptionCredential.java # priam/src/main/java/com/netflix/priam/backup/AbstractBackup.java # priam/src/main/java/com/netflix/priam/backup/AbstractBackupPath.java # priam/src/main/java/com/netflix/priam/backup/AbstractRestore.java # priam/src/main/java/com/netflix/priam/backup/BackupFileSystemContext.java # priam/src/main/java/com/netflix/priam/backup/CommitLogBackup.java # priam/src/main/java/com/netflix/priam/backup/CommitLogBackupTask.java # priam/src/main/java/com/netflix/priam/backup/IFileSystemContext.java # priam/src/main/java/com/netflix/priam/backup/IncrementalBackup.java # priam/src/main/java/com/netflix/priam/backup/IncrementalMetaData.java # priam/src/main/java/com/netflix/priam/backup/IncrementalRestore.java # priam/src/main/java/com/netflix/priam/backup/MetaData.java # priam/src/main/java/com/netflix/priam/backup/Restore.java # priam/src/main/java/com/netflix/priam/backup/SnapshotBackup.java # priam/src/main/java/com/netflix/priam/configSource/SimpleDBConfigSource.java # priam/src/main/java/com/netflix/priam/cryptography/IFileCryptography.java # priam/src/main/java/com/netflix/priam/cryptography/pgp/PgpCredential.java # priam/src/main/java/com/netflix/priam/cryptography/pgp/PgpCryptography.java # priam/src/main/java/com/netflix/priam/cryptography/pgp/PgpUtil.java # priam/src/main/java/com/netflix/priam/defaultimpl/CassandraProcessManager.java # priam/src/main/java/com/netflix/priam/defaultimpl/PriamConfiguration.java # priam/src/main/java/com/netflix/priam/defaultimpl/PriamGuiceModule.java # priam/src/main/java/com/netflix/priam/google/GcsCredential.java # priam/src/main/java/com/netflix/priam/google/GoogleEncryptedFileSystem.java # priam/src/main/java/com/netflix/priam/google/GoogleEncryptedFileSystemMBean.java # priam/src/main/java/com/netflix/priam/google/GoogleFileIterator.java # priam/src/main/java/com/netflix/priam/identity/DoubleRing.java # priam/src/main/java/com/netflix/priam/identity/IPriamInstanceFactory.java # priam/src/main/java/com/netflix/priam/identity/InstanceIdentity.java # priam/src/main/java/com/netflix/priam/identity/token/DeadTokenRetriever.java # priam/src/main/java/com/netflix/priam/identity/token/IDeadTokenRetriever.java # priam/src/main/java/com/netflix/priam/identity/token/INewTokenRetriever.java # priam/src/main/java/com/netflix/priam/identity/token/IPreGeneratedTokenRetriever.java # priam/src/main/java/com/netflix/priam/identity/token/NewTokenRetriever.java # priam/src/main/java/com/netflix/priam/identity/token/PreGeneratedTokenRetriever.java # priam/src/main/java/com/netflix/priam/identity/token/TokenRetrieverBase.java # priam/src/main/java/com/netflix/priam/resources/BackupServlet.java # priam/src/main/java/com/netflix/priam/resources/CassandraAdmin.java # priam/src/main/java/com/netflix/priam/resources/CassandraConfig.java # priam/src/main/java/com/netflix/priam/resources/PriamInstanceResource.java # priam/src/main/java/com/netflix/priam/restore/AwsCrossAccountCryptographyRestoreStrategy.java # priam/src/main/java/com/netflix/priam/restore/EncryptedRestoreStrategy.java # priam/src/main/java/com/netflix/priam/restore/GoogleCryptographyRestoreStrategy.java # priam/src/main/java/com/netflix/priam/restore/IRestoreStrategy.java # priam/src/main/java/com/netflix/priam/restore/RestoreContext.java # priam/src/main/java/com/netflix/priam/scheduler/CronTimer.java # priam/src/main/java/com/netflix/priam/scheduler/PriamScheduler.java # priam/src/main/java/com/netflix/priam/scheduler/SimpleTimer.java # priam/src/main/java/com/netflix/priam/tuner/StandardTuner.java # priam/src/main/java/com/netflix/priam/utils/BoundedExponentialRetryCallable.java # priam/src/main/java/com/netflix/priam/utils/RetryableCallable.java # priam/src/main/java/com/netflix/priam/utils/SystemUtils.java # priam/src/main/java/com/netflix/priam/utils/TuneCassandra.java # priam/src/main/java/org/apache/cassandra/io/sstable/SSTableLoaderWrapper.java # priam/src/test/java/com/netflix/priam/FakeConfiguration.java # priam/src/test/java/com/netflix/priam/TestModule.java # priam/src/test/java/com/netflix/priam/backup/BRTestModule.java # priam/src/test/java/com/netflix/priam/backup/FakedS3EncryptedFileSystem.java # priam/src/test/java/com/netflix/priam/backup/TestBackup.java # priam/src/test/java/com/netflix/priam/backup/TestFileIterator.java # priam/src/test/java/com/netflix/priam/backup/TestS3FileSystem.java # priam/src/test/java/com/netflix/priam/backup/identity/InstanceTestUtils.java # priam/src/test/java/com/netflix/priam/backup/identity/token/FakeDeadTokenRetriever.java # priam/src/test/java/com/netflix/priam/backup/identity/token/FakeNewTokenRetriever.java # priam/src/test/java/com/netflix/priam/backup/identity/token/FakePreGeneratedTokenRetriever.java # priam/src/test/java/com/netflix/priam/cassandra/token/TestDoublingLogic.java # priam/src/test/java/com/netflix/priam/identity/FakePriamInstanceFactory.java # priam/src/test/java/com/netflix/priam/resources/BackupServletTest.java # priam/src/test/java/com/netflix/priam/resources/CassandraConfigTest.java # priam/src/test/java/com/netflix/priam/resources/PriamInstanceResourceTest.java
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge Apache C* 2.x branch to master.