flok 0.0.83 → 0.0.84

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bd8fa8fdb50bddf42da16826b0046fb59193ce7
-  data.tar.gz: f65050b61273c66c424aeae68568cf0eb7272512
+  metadata.gz: 45e269cfb7782fb14a1cee271a4e3463469765e8
+  data.tar.gz: f75ef3e15dd33ba3c46b001f2d746e2e035c4714
 SHA512:
-  metadata.gz: d70b9cdc7e87a2b068b55b255a112838a04bac27dca48d5d05b1d6e5023d71a05930856dfe3a256161f4b557a1fbb13996cd7d561c7b45808882256d39057c34
-  data.tar.gz: 36c1164fdefca9a1f9a53b9e845d4cdebfd66f1ae8084bfa0f3d4433a8bcf834003694d71453fb81d46a55ffe73b95c919c5799652b0d14de3d2bf01b40a1f58
+  metadata.gz: fc8d027a642ebc2958501f1102697dea6a06e2a83feb1f865933e8d246d0a3a3a91c10a24575a4967f9d774e553a0779e1c9f67902231cdc86b36ec14d3e0f5e
+  data.tar.gz: 39cd9c82e3f12d2dc6b1479c266e7120e00b5217a568ce65ea12128a4721a288a3bfcd2e8f0a64acd072fe35c6803c75113015528e7c8e4e9ff128b1ecb5806c

data/app/kern/services/vm.rb

@@ -119,14 +119,17 @@ service :vm do
     function int_per_get_res(s, ns, id, res) {
       if (ns === "__reserved__") {
         if (id === "vm_unsynced") {
-          var old_vm_unsynced = vm_unsynced;
-          vm_unsynced = res;
+          if (res === null) { return; }
+          var cached_vm_unsynced = res;
 
           <% @options[:pagers].each do |p| %>
-            var old_vm_unsynced_ns = old_vm_unsynced.<%= p[:namespace] %>;
-            var ids = Object.keys(old_vm_unsynced_ns);
-            for (var i = 0; i < ids.length; ++i) {
-              vm_unsynced.<%= p[:namespace] %>[ids[i]] = old_vm_unsynced_ns[ids[i]];
+            //Make sure disk has the old namespace
+            if (cached_vm_unsynced.<%= p[:namespace] %> !== undefined) {
+              //Get all the ids from the old namespace
+              var ids = Object.keys(cached_vm_unsynced.<%= p[:namespace] %>)
+              for (var i = 0; i < ids.length; ++i) {
+                vm_unsynced.<%= p[:namespace] %>[ids[i]] = cached_vm_unsynced.<%= p[:namespace] %>[ids[i]];
+              }
             }
           <% end %>
         }

data/lib/flok/version.rb

@@ -1,3 +1,3 @@
 module Flok
-  VERSION = "0.0.83"
+  VERSION = "0.0.84"
 end

data/spec/kern/vm_service_unsynced_persist_spec.rb

@@ -98,7 +98,8 @@ RSpec.describe "kern:vm_service unsynced (persist)" do
     })
   end
 
-  it "vm_pg_sync_pagein should write out the read to vm_unsynced and merge if there are any existing elements" do
+
+  it "vm_pg_sync_pagein should not modify vm_unsynced if the read comes back with nothing" do
     ctx = flok_new_user File.read('./spec/kern/assets/vm/controller0.rb'), File.read("./spec/kern/assets/vm/config5d.rb")
     dump = ctx.evald %{
       //Needed to initialize pagers
@@ -129,6 +130,59 @@ RSpec.describe "kern:vm_service unsynced (persist)" do
     expect(res[2]).to eq("vm_unsynced")
 
     #Return the vm_unsynced
+    @driver.int "int_per_get_res", [
+      "vm",
+      "__reserved__",
+      "vm_unsynced",
+      nil
+    ]
+
+    #Expect vm_unsynced to have loaded the data
+    res = @ctx.dump("vm_unsynced")
+    expect(res).to eq({
+        "spec" => {
+          "foo" => 0,
+        },
+        "spec1" => {
+          "bar" => 1
+        }
+    })
+  end
+
+  it "vm_pg_sync_pagein should write out the read to vm_unsynced and merge if there are any existing elements" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller0.rb'), File.read("./spec/kern/assets/vm/config5d.rb")
+    dump = ctx.evald %{
+      //Needed to initialize pagers
+      base = _embed("my_controller", 0, {}, null);
+
+      vm_pg_sync_pagein();
+
+      vm_unsynced = {
+        "spec": {
+          "foo": 0
+        },
+
+        "spec1": {
+          "bar": 1
+        },
+        "spec2": {
+          "hello": "world"
+        }
+      }
+
+      int_dispatch([]);
+    }
+
+    #Should be loaded (manually called)
+    expect(ctx.eval("vm_unsynced_paged_in")).to eq(true)
+
+    #Expect a request for the special page that holds vm_unsynced
+    @driver.ignore_up_to "if_per_get", 2
+    res = @driver.get "if_per_get", 2
+    expect(res[1]).to eq("__reserved__")
+    expect(res[2]).to eq("vm_unsynced")
+
+    #Return the vm_unsynced, spec3 no longer exists
     @driver.int "int_per_get_res", [
       "vm",
       "__reserved__",
@@ -138,6 +192,9 @@ RSpec.describe "kern:vm_service unsynced (persist)" do
           "holah" => 1,
         },
         "spec1" => {
+        },
+        "spec3" => {
+          "foo" => "bar"
         }
       }
     ]
@@ -146,11 +203,14 @@ RSpec.describe "kern:vm_service unsynced (persist)" do
     res = @ctx.dump("vm_unsynced")
     expect(res).to eq({
         "spec" => {
-          "foo" => 0,
           "holah" => 1,
+          "foo" => 0,
         },
         "spec1" => {
           "bar" => 1
+        },
+        "spec2" => {
+          "hello" => "world"
         }
     })
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flok
 version: !ruby/object:Gem::Version
-  version: 0.0.83
+  version: 0.0.84
 platform: ruby
 authors:
 - seo