Set up {m,c,a}times on copied files (#2145).

diff --git a/src/lib/ext.cc b/src/lib/ext.cc
index feba68c1f6eec9c15951b1fa70cf010b6843fafd..ec34f147216d97af091fdaaeec060c9620403fef 100644 (file)
--- a/src/lib/ext.cc
+++ b/src/lib/ext.cc
@@ -57,6 +57,7 @@ extern "C" {
 #include <lwext4/ext4_mkfs.h>
 }
 #include <boost/filesystem.hpp>
+#include <chrono>
 #include <string>
 
 
@@ -90,6 +91,18 @@ count (boost::filesystem::path dir, uint64_t& total_bytes)
        }
 }
 
+
+static
+void
+set_timestamps_to_now (boost::filesystem::path path)
+{
+       auto const now = std::chrono::duration_cast<std::chrono::seconds>(std::chrono::system_clock::now().time_since_epoch()).count();
+       ext4_mtime_set (path.generic_string().c_str(), now);
+       ext4_ctime_set (path.generic_string().c_str(), now);
+       ext4_atime_set (path.generic_string().c_str(), now);
+}
+
+
 static
 string
 write (boost::filesystem::path from, boost::filesystem::path to, uint64_t& total_remaining, uint64_t total, Nanomsg* nanomsg)
@@ -151,6 +164,8 @@ write (boost::filesystem::path from, boost::filesystem::path to, uint64_t& total
        ext4_fclose (&out);
        delete[] buffer;
 
+       set_timestamps_to_now (to);
+
        return digester.get ();
 }
 
@@ -231,6 +246,7 @@ copy (boost::filesystem::path from, boost::filesystem::path to, uint64_t& total_
                if (r != EOK) {
                        throw CopyError (String::compose("Failed to create directory %1", cr.generic_string()), r);
                }
+               set_timestamps_to_now (cr);
 
                for (directory_iterator i = directory_iterator(from); i != directory_iterator(); ++i) {
                        copy (i->path(), cr, total_remaining, total, copied_files, nanomsg);

diff --git a/test/disk_writer_test.cc b/test/disk_writer_test.cc
index 217032d758f4d99db3a5bd27a9b0e53a1361f66b..60d7fe22aeff1f576a7e0caf45323bb0bb923e7c 100644 (file)
--- a/test/disk_writer_test.cc
+++ b/test/disk_writer_test.cc
@@ -53,14 +53,13 @@ create_empty (boost::filesystem::path file, int size)
 
 
 vector<string>
-ext2_ls (string path)
+ext2_ls (vector<string> arguments)
 {
        using namespace boost::process;
 
        boost::asio::io_service ios;
        future<string> data;
-       /* e2ls is from 'e2tools */
-       child ch (search_path("e2ls"), path, std_in.close(), std_out > data, ios);
+       child ch (search_path("e2ls"), arguments, std_in.close(), std_out > data, ios);
        ios.run();
 
        auto output = data.get();
@@ -71,9 +70,11 @@ ext2_ls (string path)
 }
 
 
-/** Use the writer code to make a disk and partition and copy a file to it, then check
- *  that the partition has inode size 128 and that the file can be copied back off using
- *  e2tools.
+/** Use the writer code to make a disk and partition and copy a file (in a directory)
+ *  to it, then check that:
+ *  - the partition has inode size 128
+ *  - the file and directory have reasonable timestamps
+ *  - the file can be copied back off the disk
  */
 BOOST_AUTO_TEST_CASE (disk_writer_test1)
 {
@@ -116,8 +117,22 @@ BOOST_AUTO_TEST_CASE (disk_writer_test1)
                BOOST_CHECK_EQUAL (matches[1].str(), "128");
        }
 
-       BOOST_CHECK (ext2_ls(partition.string()) == vector<string>({"disk_writer_test1", "lost+found"}));
-       BOOST_CHECK (ext2_ls(partition.string() + ":disk_writer_test1") == vector<string>({"foo"}));
+       BOOST_CHECK (ext2_ls({partition.string()}) == vector<string>({"disk_writer_test1", "lost+found"}));
+
+       string const unset_date = "1-Jan-1970";
+
+       /* Check timestamp of the directory has been set */
+       auto details = ext2_ls({"-l", partition.string()});
+       BOOST_REQUIRE (details.size() >= 6);
+       BOOST_CHECK (details[5] != unset_date);
+
+       auto const dir = partition.string() + ":disk_writer_test1";
+       BOOST_CHECK (ext2_ls({dir}) == vector<string>({"foo"}));
+
+       /* Check timestamp of foo */
+       details = ext2_ls({"-l", dir});
+       BOOST_REQUIRE (details.size() >= 6);
+       BOOST_CHECK (details[5] != unset_date);
 
        system ("e2cp " + partition.string() + ":disk_writer_test1/foo build/test/disk_writer_test1_foo_back");
        check_file ("build/test/disk_writer_test1/foo", "build/test/disk_writer_test1_foo_back");