Changeset 40894

Timestamp:

Sep 24, 2019, 10:52:39 AM (7 years ago)

Author:

fairlamb

Message:

enabled mysqldump for atlassian backups

Location:

branches/ipp-132_automate_jira_conf_backups/backups

Files:

• atlassian_backups.config (modified) (1 diff)
• backup_atlassian_applications.py (modified) (5 diffs)
• backup_atlassian_applications_test.py (modified) (7 diffs)

branches/ipp-132_automate_jira_conf_backups/backups/atlassian_backups.config

@@ -8 +8 @@
 conf_attachments_path = /var/atlassian/application-data/confluence/attachments
 mysqldump_password = not_a_real_password
-verbose = True
+verbose = False

branches/ipp-132_automate_jira_conf_backups/backups/backup_atlassian_applications.py

@@ -99 +99 @@
         self.verbose               = config.getboolean('atlassian_backups', 'verbose')
 
+        self.mysqldump_password    = _get_str_key_from_section(config, section, 'mysqldump_password')
+
     def target_backup_paths_ok(self) -> bool:
         copy_paths = [ self.host_backup_path
@@ -150 +152 @@
         tar_return = self._tar_attachments()
 
+        # mysqldump
+        mysqldump_return = self.make_mysql_dump(self.mysqldump_password)
+
         # If successful: move tmp to old
-        if jira_return == 0 and conf_return == 0 and tar_return == 0:
+        if jira_return == 0 and conf_return == 0 and tar_return == 0 and mysqldump_return == 0:
             _move_dir_contents_to_dir(tmp_paths, old_paths, self.verbose)
         else:
@@ -252 +257 @@
         # do this as the dumper user
 
+        print(dump_password)
+
         latest_paths = self.target_paths("latest")
         if not self.target_backup_paths_ok():
@@ -270 +277 @@
                          , '--databases', 'jiradb', 'confluencedb'
                          ]
+        print(mysqldump_args)
         with open(dump_filepath, "w+") as df:
             mysqldump_process = subprocess.Popen(mysqldump_args, stdout=df, stderr=subprocess.PIPE)
@@ -278 +286 @@
         if stde is not None:
             decoded_stderr = stde.decode()
+            print(decoded_stderr)
+            print(decoded_stderr.casefold().find('error'.casefold()))
             if decoded_stderr.casefold().find('error'.casefold()) > -1:
                 raise sub_utils.SubprocessError()

branches/ipp-132_automate_jira_conf_backups/backups/backup_atlassian_applications_test.py

@@ -25 +25 @@
         'conf_backup_path'      : os.path.join(tmpdir, 'conf_backup_path'),
         'jira_attachments_path' : os.path.join(tmpdir, 'jira_attachments_path'),
-        'conf_attachments_path' : os.path.join(tmpdir, 'conf_attachments_path')
+        'conf_attachments_path' : os.path.join(tmpdir, 'conf_attachments_path'),
+        'mysqldump_password'    : 'not_a_real_password'
     }
 
@@ -42 +43 @@
         assert ab.jira_attachments_path == "/var/atlassian/application-data/jira/data"
         assert ab.conf_attachments_path == "/var/atlassian/application-data/confluence/attachments"
+        assert ab.mysqldump_password    == "not_a_real_password"
         assert ab.verbose is True
 
@@ -54 +56 @@
         assert ab.jira_attachments_path == "/var/atlassian/application-data/jira/data"
         assert ab.conf_attachments_path == "/var/atlassian/application-data/confluence/attachments"
+        assert ab.mysqldump_password    == "not_a_real_password"
 
     def test_default_arguments(self):
@@ -65 +68 @@
         assert ab.jira_attachments_path == "/var/atlassian/application-data/jira/data"
         assert ab.conf_attachments_path == "/var/atlassian/application-data/confluence/attachments"
+        assert ab.mysqldump_password    == "not_a_real_password"
 
     def test_providing_config_directly(self):
@@ -76 +80 @@
         config.set('atlassian_backups', 'jira_attachments_path', 'custom_config6')
         config.set('atlassian_backups', 'conf_attachments_path', 'custom_config7')
+        config.set('atlassian_backups', 'mysqldump_password',    'custom_config8')
         config.set('atlassian_backups', 'verbose', 'False')
 
@@ -87 +92 @@
         assert ab.jira_attachments_path == 'custom_config6'
         assert ab.conf_attachments_path == 'custom_config7'
+        assert ab.mysqldump_password    == 'custom_config8'
         assert ab.verbose is False
 
@@ -386 +392 @@
     """ The mySQL dump tests require the machine on which they are
 running to have a mysql database running with a user called
-'dumper' and the password listed below.
-
+'dumper' and a password set to 'not_a_real_password'.
+
+In production, a proper password should be set on the server and in the config
+file.
+
+To change the password:
 UPDATE mysql.user SET authentication_string = PASSWORD('NEW_USER_PASSWORD')WHERE User = 'user-name' AND Host = 'localhost';FLUSH PRIVILEGES;
-
-Note that the actual password used for the backups is not included here,
-or in the main backup code for security.
 """