Merge lp:~mterry/deja-dup/tempdir-archive-dir into lp:deja-dup/26

[Michael Terry]

A little while back, for 25.5, I added code to tell duplicity to use a tempdir that is on the same partition as the source files, so that a user with /tmp as a tmpfs partition wouldn't fill it up.

However, there is one code path where we end up using /tmp anyway, that I didn't notice. If we are testing a restore in "nag mode", which is where we don't use any cached information (we re-download all the metadata and ask for the password again, hence the "nag"), we were making a call to g_dir_make_tmp. This uses /tmp, and we were filling /tmp up with our downloaded metadata.

So the solution is to use g_mkdtemp, which lets us specify a tempdir, and we'll re-use the one we create for passing to duplicity.

There's a bit of cleanup in the tests/ directory to match this new usage and to better test it.

[lp:~mterry/deja-dup/tempdir-archive-dir]

1446. By Michael Terry on 2013-03-25

use duplicity-XXXXXX instead of deja-dup-XXXXXX so that we will clean the folder automatically

[Robert Bruce Park (robru)]

So, the diff looks quite nice, but 'make check' failed with this error:

/scripts/instance-error: OK
/scripts/mkdir: OK
/scripts/nag:
** (/home/robru/Applications/deja-dup/tempdir-archive-dir/tests/.libs/lt-runner:4911): WARNING **: runner.vala:292: Error string didn't match; expected (null), got Failed with an unknown error.
/bin/bash: line 1: 4911 Trace/breakpoint trap (core dumped) top_builddir=.. srcdir=. dbus-launch ./runner $test
make[1]: *** [check] Error 133
make[1]: Leaving directory `/home/robru/Applications/deja-dup/tempdir-archive-dir/tests'
make: *** [check-recursive] Error 1

review: Needs Fixing

[Michael Terry (mterry)]

Ah, whoops. That was because of my second commit. I forgot to update the test to account for the change. Fixing that is just test-side and does not change the logic of the merge, so I'll just go ahead and merge.

=== modified file 'tests/mock/duplicity'
--- tests/mock/duplicity	2012-10-30 00:19:38 +0000
+++ tests/mock/duplicity	2013-03-25 20:12:23 +0000
@@ -108,7 +108,8 @@
       if split[1].find("/cache/") != -1:
         print("TESTFAIL: expected random /tmp archive dir", file=logfd)
         sys.exit(-1)
-      sys.argv[i] = "--archive-dir=?"
+      # Chop off random string at end, for reproducable tests
+      sys.argv[i] = sys.argv[i][:-6] + "?"
 
 if expected_args != sys.argv[1:]:
   print("TESTFAIL: expected\n%s\nvs\n%s" % (expected_args, sys.argv[1:]), file=logfd)

=== modified file 'tests/runner.vala'
--- tests/runner.vala	2013-02-04 20:39:45 +0000
+++ tests/runner.vala	2013-03-25 20:12:23 +0000
@@ -140,13 +140,12 @@
   var backupdir = Path.build_filename(test_home, "backup");
   var restoredir = Path.build_filename(test_home, "restore");
 
-  var archive = tmp_archive ? "?" : "%s/deja-dup".printf(cachedir);
-
   string enc_str = "";
   if (!encrypted)
     enc_str = "--no-encryption ";
 
   var tempdir = Path.build_filename(test_home, "tmp");
+  var archive = tmp_archive ? "%s/deja-dup-?".printf(tempdir) : "%s/deja-dup".printf(cachedir);
 
   var end_str = "%s'--verbosity=9' '--gpg-options=--no-use-agent' '--archive-dir=%s' '--tempdir=%s' '%s'".printf(enc_str, archive, tempdir, make_fd_arg(as_root));
 

=== modified file 'tools/duplicity/DuplicityInstance.vala'
--- tools/duplicity/DuplicityInstance.vala	2013-01-24 14:31:08 +0000
+++ tools/duplicity/DuplicityInstance.vala	2013-03-25 20:12:23 +0000
@@ -93,12 +93,10 @@
     // Cache signature files
     var cache_dir = forced_cache_dir;
     if (cache_dir == null)
-      cache_dir = Environment.get_user_cache_dir();
-    if (cache_dir != null) {
-      cache_dir = Path.build_filename(cache_dir, Config.PACKAGE);
-      if (DejaDup.ensure_directory_exists(cache_dir))
-        argv.append("--archive-dir=" + cache_dir);
-    }
+      cache_dir = Path.build_filename(Environment.get_user_cache_dir(),
+                                      Config.PACKAGE);
+    if (cache_dir != null && DejaDup.ensure_directory_exists(cache_dir))
+      argv.append("--archive-dir=" + cache_dir);
 
     // Specify tempdir
     var tempdir = yield DejaDup.get_tempdir();

=== modified file 'tools/duplicity/DuplicityJob.vala'
--- tools/duplicity/DuplicityJob.vala	2013-01-20 19:54:44 +0000
+++ tools/duplicity/DuplicityJob.vala	2013-03-25 20:12:23 +0000
@@ -110,9 +110,6 @@
 
   ~DuplicityJob() {
     DejaDup.Network.get().notify["connected"].disconnect(network_changed);
-
-    if (forced_cache_dir != null)
-      new DejaDup.RecursiveDelete(File.new_for_path(forced_cache_dir)).start_async.begin();
   }
 
   public override void start()
@@ -130,24 +127,22 @@
     if (mode == DejaDup.ToolJob.Mode.BACKUP)
       process_include_excludes();
 
+    var settings = DejaDup.get_settings();
+    delete_age = settings.get_int(DejaDup.DELETE_AFTER_KEY);
+
+    async_setup.begin();
+  }
+
+  async void async_setup()
+  {
     /* Fake cache dir if we need to */
     if ((flags & DejaDup.ToolJob.Flags.NO_CACHE) != 0) {
-      try {
-        forced_cache_dir = DirUtils.make_tmp("deja-dup-XXXXXX");
-      }
-      catch (Error e) {
-        warning("%s\n", e.message);
-      }
+      /* Look like a duplicity tempdir so that clean_tempdirs will clean this for us */
+      var template = Path.build_filename(yield DejaDup.get_tempdir(), "duplicity-XXXXXX");
+      forced_cache_dir = DirUtils.mkdtemp(template);
     }
 
-    var settings = DejaDup.get_settings();
-    delete_age = settings.get_int(DejaDup.DELETE_AFTER_KEY);
-
-    get_envp.begin();
-  }
-
-  async void get_envp()
-  {
+    /* Get custom environment from backend, if needed */
     try {
       backend.envp_ready.connect(continue_with_envp);
       yield backend.get_envp();