Switch to metatile based expiry on render servers

diff --git a/cookbooks/tile/templates/default/expire-tiles.erb b/cookbooks/tile/templates/default/expire-tiles.erb
index 1af7f0a64dd426e2257bc41c5fe801df705eb430..82921b7fea627275867d73177e0c86ee03a0c686 100644 (file)
--- a/cookbooks/tile/templates/default/expire-tiles.erb
+++ b/cookbooks/tile/templates/default/expire-tiles.erb
@@ -2,16 +2,53 @@
 
 # DO NOT EDIT - This file is being maintained by Chef
 
-args = [
-  "--socket=/var/run/renderd/renderd.sock",
-  "--tile-dir=/srv/tile.openstreetmap.org/tiles",
-  "--touch-from=13",
-  "--min-zoom=13"
+require "fileutils"
+
+tileDirs = [
+<% node[:tile][:styles].each_key do |name| -%>
+  "/srv/tile.openstreetmap.org/tiles/<%= name %>",
+<% end -%>
 ]
 
+tilesExpired = 0
+tilesIgnored = 0
+
+expiredTime = Time.new(2000, 1, 1)
+
 Dir.glob("/var/lib/replicate/expire-queue/changes-*.txt").sort.each do |f|
-  <% node[:tile][:styles].each do |name,details| -%>
-  system("/usr/bin/render_expired", "--map=<%= name %>", *args, "--max-zoom=<%= details[:max_zoom] %>", :in=> f) &&
-  <% end -%>
+  File.open(f, "r") do |file|
+    file.each do |line|
+      z, y, x = line.split("/")
+
+      z = z.to_i + 3
+      y = y.to_i * 8
+      x = x.to_i * 8
+
+      hash = []
+
+      1.upto(5) do
+        hash.push(((x & 0xf) << 4) | (y & 0xf))
+
+        x = x >> 4
+        y = y >> 4
+      end
+
+      tileName = "#{z}/#{hash[4]}/#{hash[3]}/#{hash[2]}/#{hash[1]}/#{hash[0]}.meta"
+
+      tileDirs.each do |tileDir|
+        if File.exist?("#{tileDir}/#{tileName}")
+          FileUtils.touch("#{tileDir}/#{tileName}", :mtime => expiredTime)
+
+          tilesExpired = tilesExpired + 1
+        else
+          tilesIgnored = tilesIgnored + 1
+        end
+      end
+    end
+  end
+
   File::unlink(f)
 end
+
+puts "Meta tiles expired: #{tilesExpired}"
+puts "Meta tiles not present: #{tilesIgnored}"

diff --git a/cookbooks/tile/templates/default/replicate.erb b/cookbooks/tile/templates/default/replicate.erb
index f0fa899612f644377964425ede279fa20cc9a5b1..8d8e287925dac83e13106fd4080bf96ccdd62477 100644 (file)
--- a/cookbooks/tile/templates/default/replicate.erb
+++ b/cookbooks/tile/templates/default/replicate.erb
@@ -10,7 +10,7 @@ do
     -- \
     --number-processes=1 \
     --log-progress=false \
-    --expire-tiles=13-19 \
+    --expire-tiles=10-16 \
     --expire-segment-length=90000 \
     --expire-output=/var/lib/replicate/dirty-tiles.txt \
 <% if node[:tile][:database][:multi_geometry] -%>