Skip to content
Snippets Groups Projects
  1. Aug 16, 2017
  2. Aug 14, 2017
  3. Aug 11, 2017
  4. Aug 10, 2017
  5. Aug 08, 2017
  6. Aug 07, 2017
    • Simona Vetter's avatar
      dim: symbolic link for the rr-cache · 8ddc67a9
      Simona Vetter authored
      
      After about a month and a few attempts it's clear that my rr-cache gc
      logic is busted. When copying stuff back&forth between the git branch
      and git's rr-cache dir, something somewhere (or maybe it's git rerere
      itself) touches all files and wreaks the timestamps.
      
      End result is that over this month, every time when someone gc'ed a
      few files, they've been resurrected a few days later by someone else.
      
      I think the only way to fix this is by dropping the copying and
      replacing git's rr-cache with a symbolic link. That way, when we
      delete an rr-cache entry in the git branch, it won't be able to
      resurrect. I hope at least ...
      
      This also makes dim revert-rerere no longer needed, delete it.
      
      v2: Unfunny the ln option placement (Jani).
      
      Acked-by: default avatarJani Nikula <jani.nikula@linux.intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      8ddc67a9
  7. Aug 03, 2017
  8. Jul 26, 2017
  9. Jul 24, 2017
    • Simona Vetter's avatar
      dim: Make rr-cache more robust · 72953209
      Simona Vetter authored
      
      There's a failure mode I didn't take into account:
      
      1. You start a dim rebuild-tip, and update your rr-cache. Because you
      didn't push for a while, this adds some really old files (but with
      today's timestamp).
      
      2. 2nd person finished their dim rebuild-tip and garbage-collects the
      old rr-cache entries.
      
      3. We get to commit_rr_cache, and the first thing the script does is
      update the rr-cache branch, which deletes the old entries.
      
      4. Then we copy them over again, because their timestamp is fresh.
      
      5. The filtering doesn't catch them, because git ls-files doesn't list
      them (they're deleted files after all).
      
      6. They get re-added right away.
      
      I think this is what happend today between Chris and Imre, and
      resulted in a bit of confusion.
      
      I think if we pull only after copying this would be avoided, since the
      pull would delete the files the 2nd person gc'ed in step 2, and so
      prevents them from getting re-added. Worst case there's a functional
      conflict and the pusher needs to clean up the mess.
      
      Reviewed-by: Sean Paul's avatarSean Paul <seanpaul@chromium.org>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      72953209
    • Simona Vetter's avatar
      dim: remove debug output · 45c1b402
      Simona Vetter authored
      
      Oops. It caused some concerns from people running dim rebuild-tip.
      
      v2: Drop misplaced changes I forgot to remove (Imre).
      
      Acked-by: default avatarImre Deak <imre.deak@linux.intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      45c1b402
    • Imre Deak's avatar
      dim: Suppress output of git pull into the rerere-cache branch · 6a35d6b0
      Imre Deak authored
      
      The output of git pull into the rr-cache branch isn't really
      interesting, so suppress it like during the rest of rr-cache
      branch maintenance commands.
      
      Cc: Jani Nikula <jani.nikula@intel.com>
      Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
      Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      6a35d6b0
  10. Jul 20, 2017
  11. Jul 18, 2017
  12. Jul 17, 2017
  13. Jul 14, 2017
    • Simona Vetter's avatar
      dim: Try to gc the rr-cache · 12a25fd6
      Simona Vetter authored
      
      The problem is that we have a distributed cache - every committer has
      a copy. Which means even just a slight clock skew will make sure that
      a naive gc algorithm results in lots of thrashing around.
      
      To fix this add a huge hysteresis: Only add files newer than 1 day,
      and only remove them when older than 60 days. As long as people have
      reasonable accurate clocks on their machines this should work.
      
      A different problem is that we can't use filesystem timestamps (and
      hence can't use git rerere gc): When someone comes back from vacations
      and updates git rerere, all the files will have current timestamps,
      even when they've been pushed out weeks ago. To fix that, use the git
      log to judge old files to remove. Also, remove old files before adding
      new ones, to avoid confusion.
      
      Also, we need to teach the cp -r to preserve timestamps, otherwise
      this won't work.
      
      v2: Use git log to remove old files.
      
      v3: Remove the debug uncommenting (Sean).
      
      v4: Split out code movement and explain better what's going on (Jani).
      
      Reviewed-by: Sean Paul's avatarSean Paul <seanpaul@chromium.org>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      12a25fd6
    • Simona Vetter's avatar
      dim: Move all rerere updating into helpers · 599eb3db
      Simona Vetter authored
      
      Just prep work.
      
      Reviewed-by: Sean Paul's avatarSean Paul <seanpaul@chromium.org>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      599eb3db
  14. Jul 12, 2017
  15. Jul 10, 2017
    • Rodrigo Vivi's avatar
      drm-intel: Fix links to torvalds documentation. · edf1f784
      Rodrigo Vivi authored
      
      All process related docs has moved to the new "process" folder,
      but also all .txt migrated to .rst as well.
      
      However let's link to final generated .html instead of .rst
      
      Ideally .rst would referrence .rst with :ref:`` but since
      these documentation are different repository we cannot link
      like this. However the main usage is through the
      compiled html pages and since we already reference another
      .html here so let's use our daily compiled doc.
      
      v2: squashed drm-intel: Link to .html instead of .rst
      
      Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
      Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
      edf1f784
  16. Jul 06, 2017
  17. Jun 28, 2017
    • Simona Vetter's avatar
      dim: Fixes/polish for cherry-pick · ee9c0149
      Simona Vetter authored
      
      - Subcommands without subshell is nice, except it can break worktree
        setups: Branch specific commands want to run in the worktree,
        general commands like dim_cite switch back to the main directory.
        Tears ensue (or well, some cryptic complaint from git that
        cherry-pick --abort failed because there's no cherry-pick in
        progress). Run it in a subshell.
      
        Not sure we need a general fix to make this more robust.
      
      - Document commands a bit better.
      
      Cc: Jani Nikula <jani.nikula@linux.intel.com>
      Acked-by: default avatarJani Nikula <jani.nikula@linux.intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      ee9c0149
  18. Jun 19, 2017
Loading