1. 12 Nov, 2015 12 commits
  2. 11 Nov, 2015 6 commits
  3. 10 Nov, 2015 13 commits
  4. 09 Nov, 2015 5 commits
    • Andrew Vagin's avatar
      zdtm: call test_daemon when a test state is created · 9bbb2b09
      Andrew Vagin authored
      Otherwise a test can create or delete some mappings:
      
      8306  getppid()                         = 83
      8306  kill(83, SIGTERM)                 = 0
      8306  clock_gettime(CLOCK_BOOTTIME, {1916694, 423447417}) = 0
      8306  clock_gettime(CLOCK_MONOTONIC_COARSE, {1916694, 419509587}) = 0
      8306  open("/etc/localtime", O_RDONLY|O_CLOEXEC)              = 3
      8306  fstat(3, {st_mode=S_IFREG|0644, st_size=127, ...}) = 0
      8306  fstat(3, {st_mode=S_IFREG|0644, st_size=127, ...}) = 0
      8306  mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0 <unfinished ...>
      8306  <... mmap resumed> )              = 0x3fffa8570000
      8306  read(3, "TZif2...", 4096) = 127
      8306  lseek(3, -71, SEEK_CUR)             = 56
      8306  read(3, "TZif2...", 4096) = 71
      8306  close(3 <unfinished ...>
      8306  <... close resumed> )             = 0
      8306  munmap(0x3fffa8570000, 4096 <unfinished ...>
      8306  <... munmap resumed> )            = 0
      8306  write(2, "12:15:36.347:    84: ( start) boottime 1916694 boottime-coarse 1916694 total_sleep_time 0\n", 90 )             = 90
      8306  futex(0x10020850, FUTEX_WAIT, 0, NULL <unfinished ...>
      
      Reported-by: Mr Jenkins
      Signed-off-by: 's avatarAndrew Vagin <avagin@openvz.org>
      Acked-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
      Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
      9bbb2b09
    • Tycho Andersen's avatar
      net: ipv4: add ignore_routes_with_linkdown sysctl · 5f0b9ae1
      Tycho Andersen authored
      Looks like this is new as of the 4.2 timeframe. It does bring up a
      question: should we do a ls /proc/sys/net/conf/lo on the host to figure out
      what sysctls to try and dump instead of use this hardcoded list? I guess we
      need to check file modes too, because of mc_forwarding, but something like
      that.
      
      v2: add ignore_routes_with_linkdown to the end of the hardcoded devconfs
          list, so as not to break migration across criu versions.
      Signed-off-by: 's avatarTycho Andersen <tycho.andersen@canonical.com>
      Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
      5f0b9ae1
    • Tycho Andersen's avatar
      mnt: don't dump external mounts · b6cdc5e9
      Tycho Andersen authored
      These are going to be bind mounted from the outside world after all, so
      there is no use in dumping them.
      Signed-off-by: 's avatarTycho Andersen <tycho.andersen@canonical.com>
      Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
      b6cdc5e9
    • Tycho Andersen's avatar
      mnt: always_fail should report an error · b6a355c3
      Tycho Andersen authored
      Otherwise, you just see an anonymous failure in the logs, like:
      
      (00.244773) mnt: Dumping mountpoints
      (00.244781) mnt:        253: 42:/ @ ./dev/.lxc
      (00.244793) mnt: Path `/dev/.lxc' resolved to `./dev/.lxc' mountpoint
      (00.249039) mnt:        133: 41:/ @ ./dev/hugepages
      (00.249052) mnt:        116: 40:/ @ ./run/lock
      (00.249064) mnt: Path `/run/lock' resolved to `./run/lock' mountpoint
      (00.251948) mnt:        115: 3f:/ @ ./run
      (00.251970) mnt: Something is mounted on top of ./run
      (00.264803) mnt: Path `/run' resolved to `./run' mountpoint
      tar: ./uuidd/request: socket ignored
      tar: ./dbus/system_bus_socket: socket ignored
      tar: ./acpid.socket: socket ignored
      tar: ./systemd/journal/syslog: socket ignored
      tar: ./systemd/journal/dev-log: socket ignored
      tar: ./systemd/journal/socket: socket ignored
      tar: ./systemd/journal/stdout: socket ignored
      tar: ./systemd/private: socket ignored
      tar: ./systemd/notify: socket ignored
      (00.368950) mnt:        113: 3e:/ @ ./dev/shm
      (00.368978) mnt: Path `/dev/shm' resolved to `./dev/shm' mountpoint
      (00.371551) mnt:        112: 3d:/ @ ./dev/pts
      (00.371566) mnt:        249: 28:/ @ ./var/lib/lxcfs
      (00.371749) Unlock network
      (00.371762) Running network-unlock scripts
      (00.371766) Unfreezing tasks into 1
      (00.371770)     Unseizing 13683 into 1
      (00.371784)     Unseizing 14839 into 1
      (00.371794)     Unseizing 15678 into 1
      (00.371800)     Unseizing 16126 into 1
      (00.371805)     Unseizing 16177 into 1
      (00.371814)     Unseizing 16301 into 1
      (00.371843)     Unseizing 16323 into 1
      (00.371854)     Unseizing 16414 into 1
      (00.371900)     Unseizing 16595 into 1
      (00.371911)     Unseizing 16695 into 1
      (00.371942)     Unseizing 16744 into 1
      (00.371964)     Unseizing 16904 into 1
      (00.372103)     Unseizing 16944 into 1
      (00.372140)     Unseizing 17558 into 1
      (00.372196) Error (cr-dump.c:1631): Dumping FAILED.
      
      ...which is hard to debug.
      Signed-off-by: 's avatarTycho Andersen <tycho.andersen@canonical.com>
      Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
      b6a355c3
    • Adrian Reber's avatar
      cr-service: fix return result for not supported cpuinfo · 6e6b9cb7
      Adrian Reber authored
      The change to fill out cr_errno if cpuinfo dump/check failed
      in the previous patch 7e862bb3
      was returning (-ENOTSUP & 0xff). To easier check for
      the return result this is now changed to just return ENOTSUP.
      Signed-off-by: 's avatarAdrian Reber <areber@redhat.com>
      Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
      6e6b9cb7
  5. 05 Nov, 2015 4 commits
    • Tycho Andersen's avatar
      zdtm.py: don't fail tests if pids collide · 7f86ceb4
      Tycho Andersen authored
      It seems with the new zdtm.py that pids collide a lot more (perhaps because
      everything is in its own pid namespace? not sure). In any case, this is
      annoying as it prevents a second run of the tests from actually getting to
      the test part.
      
      So, let's try to move the old directory out of the way.
      Signed-off-by: 's avatarTycho Andersen <tycho.andersen@canonical.com>
      Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
      7f86ceb4
    • Tycho Andersen's avatar
      zdtm.py: fix typo · a985500c
      Tycho Andersen authored
      Signed-off-by: 's avatarTycho Andersen <tycho.andersen@canonical.com>
      Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
      a985500c
    • Tycho Andersen's avatar
      use a modeline for zdtm.py to set noet · 0a2d3a9b
      Tycho Andersen authored
      Most python uses spaces, so that's probably what people have their editors
      configured to do. Since this file uses tabs, let's be explicit about it.
      Signed-off-by: 's avatarTycho Andersen <tycho.andersen@canonical.com>
      Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
      0a2d3a9b
    • Tycho Andersen's avatar
      zdtm.py: unmount tests_root before rm-ing it · 615e7995
      Tycho Andersen authored
      This avoids problems like:
      
      $ sudo ./zdtm.py run -a
      Skipping test zdtm/live/static/mem-touch (manual run only)
      ./sock_opts00 --pidfile=sock_opts00.pid --outfile=sock_opts00.out
      ./sock_opts00 --pidfile=sock_opts00.pid --outfile=sock_opts00.out
      
      ==================== Run zdtm/live/static/sock_opts00 in h =====================
      Start test
      Test is SUID
      Run CRIU: [dump -o dump.log -D dump/zdtm/live/static/sock_opts00/74/1 -v4 -t 74 --pidfile /home/ubuntu/criu/test/zdtm/live/static/sock_opts00.pid]
      Run CRIU: [restore -o restore.log -D dump/zdtm/live/static/sock_opts00/74/1 -v4 --pidfile /home/ubuntu/criu/test/zdtm/live/static/sock_opts00.pid --restore-detached]
      Wait for zdtm/live/static/sock_opts00 to die for 0.100000
      Remvoing dump/zdtm/live/static/sock_opts00/74
      ==================== Test zdtm/live/static/sock_opts00 PASS ====================
      
      ==================== Run zdtm/live/static/sock_opts00 in ns ====================
      Construct root for zdtm/live/static/sock_opts00
      Start test
      Test is SUID
      Traceback (most recent call last):
        File "zdtm.py", line 850, in <module>
          do_run_test(tinfo[0], tinfo[1], tinfo[2], tinfo[3])
        File "zdtm.py", line 641, in do_run_test
          cr(cr_api, t, opts)
        File "zdtm.py", line 562, in cr
          cr_api.set_test(test)
        File "zdtm.py", line 469, in set_test
          os.makedirs(self.__dump_path)
        File "/usr/lib/python2.7/os.py", line 157, in makedirs
          mkdir(name, mode)
      OSError: [Errno 17] File exists: 'dump/zdtm/live/static/sock_opts00/153'
      Error in atexit._run_exitfuncs:
      Traceback (most recent call last):
        File "/usr/lib/python2.7/atexit.py", line 24, in _run_exitfuncs
          func(*targs, **kargs)
        File "zdtm.py", line 46, in clean_tests_root
          os.rmdir(tests_root)
      OSError: [Errno 16] Device or resource busy: '/tmp/criu-root-MmGEQD'
      Error in sys.exitfunc:
      Traceback (most recent call last):
        File "/usr/lib/python2.7/atexit.py", line 24, in _run_exitfuncs
          func(*targs, **kargs)
        File "zdtm.py", line 46, in clean_tests_root
          os.rmdir(tests_root)
      OSError: [Errno 16] Device or resource busy: '/tmp/criu-root-MmGEQD'
      Signed-off-by: 's avatarTycho Andersen <tycho.andersen@canonical.com>
      Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
      615e7995