Username and Password needed while backup/restore

build.sh

@@ -39,7 +39,7 @@ fi
 cd cli/ && ./build-cli.sh
 if [ $? -ne 0 ]; then
   _notify_github failure "CLI build failed"
-  exit 1
+ exit 1
 fi
 cd $REPO_ROOT_DIR
 

cassandra-commons/src/main/java/com/mesosphere/dcos/cassandra/common/tasks/CassandraData.java

@@ -92,7 +92,9 @@ public static final CassandraData createBackupSchemaData(
                 context.getAccountId(),
                 context.getSecretKey(),
                 context.getUsesEmc(),
-                context.getRestoreType());
+                context.getRestoreType(),
+                context.getUsername(),
+                context.getPassword());
     }
 
     public static final CassandraData createBackupSchemaStatusData() {
@@ -113,7 +115,9 @@ public static final CassandraData createBackupSnapshotData(
                 context.getAccountId(),
                 context.getSecretKey(),
                 context.getUsesEmc(),
-                context.getRestoreType());
+                context.getRestoreType(),
+                context.getUsername(),
+                context.getPassword());
     }
 
     public static final CassandraData createBackupSnapshotStatusData() {
@@ -133,7 +137,9 @@ public static final CassandraData createBackupUploadData(
             context.getAccountId(),
             context.getSecretKey(),
             context.getUsesEmc(),
-            context.getRestoreType());
+            context.getRestoreType(),
+            context.getUsername(),
+            context.getPassword());
     }
 
     public static final CassandraData createBackupUploadStatusData() {
@@ -153,7 +159,9 @@ public static final CassandraData createSnapshotDownloadData(
             context.getAccountId(),
             context.getSecretKey(),
             context.getUsesEmc(),
-            context.getRestoreType());
+            context.getRestoreType(),
+            context.getUsername(),
+            context.getPassword());
     }
 
     public static final CassandraData createSnapshotDownloadStatusData() {
@@ -173,7 +181,9 @@ public static final CassandraData createRestoreSnapshotData(
             context.getAccountId(),
             context.getSecretKey(),
             context.getUsesEmc(),
-            context.getRestoreType());
+            context.getRestoreType(),
+            context.getUsername(),
+            context.getPassword());
     }
 
     public static final CassandraData createRestoreSnapshotStatusData() {
@@ -193,7 +203,9 @@ public static final CassandraData createRestoreSchemaData(
                 context.getAccountId(),
                 context.getSecretKey(),
                 context.getUsesEmc(),
-                context.getRestoreType());
+                context.getRestoreType(),
+                context.getUsername(),
+                context.getPassword());
     }
 
     public static final CassandraData createRestoreSchemaStatusData() {
@@ -284,7 +296,9 @@ private CassandraData(final CassandraTask.TYPE type,
                           final String accountId,
                           final String secretKey,
                           final boolean usesEmc,
-                          final String restoreType) {
+                          final String restoreType,
+                          final String username,
+                          final String password) {
 
         data = CassandraProtos.CassandraData.newBuilder()
             .setType(type.ordinal())
@@ -298,6 +312,8 @@ private CassandraData(final CassandraTask.TYPE type,
             .setState(Protos.TaskState.TASK_STAGING.ordinal())
             .setUsesEmc(usesEmc)
             .setRestoreType(restoreType)
+            .setUsername(username)
+            .setPassword(password)
             .build();
 
     }
@@ -412,7 +428,9 @@ public BackupRestoreContext getBackupRestoreContext() {
             data.getAccoundId(),
             data.getSecretKey(),
             data.getUsesEmc(),
-            data.getRestoreType());
+            data.getRestoreType(),
+            data.getUsername(),
+            data.getPassword());
     }
 
     public UpgradeSSTableContext getUpgradeSSTableContext() {

cassandra-commons/src/main/java/com/mesosphere/dcos/cassandra/common/tasks/backup/BackupRestoreContext.java

@@ -46,7 +46,11 @@ public static final BackupRestoreContext create(
         @JsonProperty("uses_emc")
         final boolean usesEmc,
         @JsonProperty("restore_type")
-        final String restoreType) {
+        final String restoreType,
+        @JsonProperty("username")
+        final String username,
+        @JsonProperty("password")
+        final String password) {
 
         return new BackupRestoreContext(
             nodeId,
@@ -56,7 +60,9 @@ public static final BackupRestoreContext create(
             accountId,
             secretKey,
             usesEmc,
-            restoreType);
+            restoreType,
+        	username,
+        	password);
     }
 
     @JsonProperty("node_id")
@@ -82,6 +88,12 @@ public static final BackupRestoreContext create(
 
     @JsonProperty("restore_type")
     private final String restoreType;
+
+    @JsonProperty("username")
+    private final String username;
+
+    @JsonProperty("password")
+    private final String password;
 
     public BackupRestoreContext(final String nodeId,
                                 final String name,
@@ -90,7 +102,7 @@ public BackupRestoreContext(final String nodeId,
                                 final String accountId,
                                 final String secretKey,
                                 final boolean usesEmc,
-                                final String restoreType) {
+                                final String restoreType, final String username, final String password) {
         this.nodeId = nodeId;
         this.externalLocation = externalLocation;
         this.name = name;
@@ -99,6 +111,8 @@ public BackupRestoreContext(final String nodeId,
         this.secretKey = secretKey;
         this.usesEmc = usesEmc;
         this.restoreType = restoreType;
+        this.username = username;
+        this.password = password;
     }
 
     /**
@@ -179,6 +193,12 @@ public String getNodeId() {
      */
     @JsonProperty("restore_type")
     public String getRestoreType() { return restoreType; }
+
+    @JsonProperty("username")
+    public String getUsername() { return username; }
+
+    @JsonProperty("password")
+    public String getPassword() { return password; }
 
     @Override
     public String toString() {
@@ -198,7 +218,9 @@ public boolean equals(Object o) {
                         that.getLocalLocation()) &&
                 Objects.equals(getAccountId(), that.getAccountId()) &&
                 Objects.equals(getSecretKey(), that.getSecretKey()) &&
-                Objects.equals(getRestoreType(), that.getRestoreType());
+                Objects.equals(getRestoreType(), that.getRestoreType()) && 
+                Objects.equals(getUsername(), that.getUsername()) &&
+                Objects.equals(getPassword(), that.getPassword());
     }
 
     @Override
@@ -217,7 +239,9 @@ public BackupRestoreContext forNode(final String nodeId){
             accountId,
             secretKey,
             usesEmc,
-            restoreType);
+            restoreType,
+            username,
+            password);
     }
 
     @JsonIgnore
@@ -230,6 +254,8 @@ public BackupRestoreContext withLocalLocation(final String localLocation){
             accountId,
             secretKey,
             usesEmc,
-            restoreType);
+            restoreType,
+            username,
+            password);
     }
 }

cassandra-commons/src/main/proto/common.proto

@@ -91,4 +91,8 @@ message CassandraData{
     optional bool usesEmc = 17;
 
     optional string restoreType = 18;
+
+    optional string username = 19;
+
+    optional string password = 20;
 }

cassandra-executor/apache-cassandra-2.2.5/conf/cassandra-rackdc.properties

@@ -1,4 +1,2 @@
-#DCOS got yo Cassandra!
-#Tue Jan 17 16:20:57 PST 2017
 dc=dc1
 rack=rac1

cassandra-executor/src/main/java/com/mesosphere/dcos/cassandra/executor/tasks/BackupSchema.java

@@ -37,7 +37,7 @@
  * using Datastax Java Driver.
  */
 public class BackupSchema implements ExecutorTask {
-  private static final Logger LOGGER = LoggerFactory.getLogger(
+	private static final Logger LOGGER = LoggerFactory.getLogger(
             BackupSchema.class);
     private CassandraDaemonProcess daemon;
     private ExecutorDriver driver;
@@ -81,7 +81,7 @@ public void run() {
           sendStatus(driver, Protos.TaskState.TASK_RUNNING,
                   "Started taking schema backup");
 
-          cluster = Cluster.builder().addContactPoint(daemon.getProbe().getEndpoint()).build();
+          cluster = Cluster.builder().addContactPoint(daemon.getProbe().getEndpoint()).withCredentials(context.getUsername(), context.getPassword()).build();
           final List<String> keyspaces = StorageUtil.filterSystemKeyspaces(daemon.getNonSystemKeySpaces());
 
           if (keyspaces.size() > 0) {

cassandra-executor/src/main/java/com/mesosphere/dcos/cassandra/executor/tasks/RestoreSchema.java

@@ -66,7 +66,8 @@ public void run() {
             sendStatus(driver, Protos.TaskState.TASK_RUNNING,
                     "Started restoring schema");
 
-            cluster = Cluster.builder().addContactPoint(daemon.getProbe().getEndpoint()).build();
+            //cluster = Cluster.builder().addContactPoint(daemon.getProbe().getEndpoint()).build();
+            cluster = Cluster.builder().addContactPoint(daemon.getProbe().getEndpoint()).withCredentials(context.getUsername(), context.getPassword()).build();
             session = cluster.connect();
             read = new Scanner(backupStorageDriver.downloadSchema(context));
             read.useDelimiter(";");

cassandra-executor/src/main/java/com/mesosphere/dcos/cassandra/executor/tasks/RestoreSnapshot.java

@@ -120,7 +120,7 @@ public void run() {
 
                         final String columnFamilyPath = columnFamily.getAbsolutePath();
                         final List<String> command = Arrays.asList(
-                                ssTableLoaderBinary, "-d", libProcessAddress, "-f",
+                                ssTableLoaderBinary, "-d", libProcessAddress, "-u",context.getUsername(),"-pw",context.getPassword(),"-f",
                                 cassandraYaml, columnFamilyPath);
                         LOGGER.info("Executing command: {}", command);
 

cassandra-executor/src/test/java/com/mesosphere/dcos/cassandra/executor/backup/S3StorageDriverTest.java

@@ -30,7 +30,9 @@ public void testGetBucketNameS3Protocol() throws URISyntaxException {
                 "account-id",
                 "secret-key",
                 false,
-                "existing");
+                "existing",
+                "username",
+                "password");
         Assert.assertEquals(bucketName, s3StorageDriver.getBucketName(backupRestoreContext));
     }
 
@@ -45,7 +47,9 @@ public void testGetBucketNameHTTPSProtocol() throws URISyntaxException {
                 "account-id",
                 "secret-key",
                 false,
-                "existing");
+                "existing",
+                "username",
+                "password");
         Assert.assertEquals(bucketName, s3StorageDriver.getBucketName(backupRestoreContext));
     }
 
@@ -60,7 +64,9 @@ public void testGetBucketNameHTTPProtocolIPPort() throws URISyntaxException {
                 "account-id",
                 "secret-key",
                 false,
-                "existing");
+                "existing",
+                "username",
+                "password");
         Assert.assertEquals(bucketName, s3StorageDriver.getBucketName(backupRestoreContext));
     }
 
@@ -75,7 +81,9 @@ public void testGetEmptyPrefixKeyS3Protocol() throws URISyntaxException {
                 "account-id",
                 "secret-key",
                 false,
-                "existing");
+                "existing",
+                "username",
+                "password");
         Assert.assertEquals(backupName, s3StorageDriver.getPrefixKey(backupRestoreContext));
     }
 
@@ -91,7 +99,9 @@ public void testGetNestedPrefixKeyS3Protocol() throws URISyntaxException {
                 "account-id",
                 "secret-key",
                 false,
-                "existing");
+                "existing",
+                "username",
+                "password");
         Assert.assertEquals(nestedPath + "/" + backupName, s3StorageDriver.getPrefixKey(backupRestoreContext));
     }
 
@@ -106,7 +116,9 @@ public void testGetEmptyPrefixKeyHTTPSProtocol() throws URISyntaxException {
                 "account-id",
                 "secret-key",
                 false,
-                "existing");
+                "existing",
+                "username",
+                "password");
         Assert.assertEquals(backupName, s3StorageDriver.getPrefixKey(backupRestoreContext));
     }
 
@@ -122,7 +134,9 @@ public void testGetNestedPrefixKeyHTTPSProtocol() throws URISyntaxException {
                 "account-id",
                 "secret-key",
                 false,
-                "existing");
+                "existing",
+                "username",
+                "password");
         Assert.assertEquals(nestedPath + "/" + backupName, s3StorageDriver.getPrefixKey(backupRestoreContext));
     }
 
@@ -136,7 +150,9 @@ public void testGetEndpointS3Protocol() throws URISyntaxException {
                 "account-id",
                 "secret-key",
                 false,
-                "existing");
+                "existing",
+                "username",
+                "password");
         Assert.assertEquals(Constants.S3_HOSTNAME, s3StorageDriver.getEndpoint(backupRestoreContext));
     }
 
@@ -151,7 +167,9 @@ public void testGetEndpointHTTPSProtocol() throws URISyntaxException {
                 "account-id",
                 "secret-key",
                 false,
-                "existing");
+                "existing",
+                "username",
+                "password");
         Assert.assertEquals(endpoint, s3StorageDriver.getEndpoint(backupRestoreContext));
     }
 
@@ -166,7 +184,9 @@ public void testGetEndpointHTTPProtocolHostPort() throws URISyntaxException {
                 "account-id",
                 "secret-key",
                 false,
-                "existing");
+                "existing",
+                "username",
+                "password");
         Assert.assertEquals(endpoint, s3StorageDriver.getEndpoint(backupRestoreContext));
     }
 
@@ -181,7 +201,9 @@ public void testGetEndpointHTTPProtocolHost() throws URISyntaxException {
                 "account-id",
                 "secret-key",
                 false,
-                "existing");
+                "existing",
+                "username",
+                "password");
         Assert.assertEquals(endpoint, s3StorageDriver.getEndpoint(backupRestoreContext));
     }
 }