Merge pull request #227 from twelho/cache-invalidation

Support checksum-based Cache invalidation, improve cache's object handling
weaveworks · Jul 22, 2019 · 5481f71 · 5481f71
2 parents 4ade869 + 9c57e26
commit 5481f71
Show file tree

Hide file tree

Showing 18 changed files with 1,929 additions and 1,748 deletions.
diff --git a/docs/dependencies.svg b/docs/dependencies.svg
diff --git a/pkg/apis/ignite/validation/validation.go b/pkg/apis/ignite/validation/validation.go
@@ -6,7 +6,6 @@ import (
 
 	api "github.com/weaveworks/ignite/pkg/apis/ignite"
 	meta "github.com/weaveworks/ignite/pkg/apis/meta/v1alpha1"
-
 	"k8s.io/apimachinery/pkg/util/validation/field"
 )
 

diff --git a/pkg/client/client_dynamic.go b/pkg/client/client_dynamic.go
@@ -6,7 +6,6 @@ import (
 	meta "github.com/weaveworks/ignite/pkg/apis/meta/v1alpha1"
 	"github.com/weaveworks/ignite/pkg/storage"
 	"github.com/weaveworks/ignite/pkg/storage/filterer"
-
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 

diff --git a/pkg/client/client_resource_template.go b/pkg/client/client_resource_template.go
@@ -16,7 +16,6 @@ import (
 	meta "github.com/weaveworks/ignite/pkg/apis/meta/v1alpha1"
 	"github.com/weaveworks/ignite/pkg/storage"
 	"github.com/weaveworks/ignite/pkg/storage/filterer"
-
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 

diff --git a/pkg/client/zz_generated.client_image.go b/pkg/client/zz_generated.client_image.go
@@ -1,4 +1,3 @@
-
 /*
 	Note: This file is autogenerated! Do not edit it manually!
 	Edit client_image_template.go instead, and run
@@ -15,7 +14,6 @@ import (
 	meta "github.com/weaveworks/ignite/pkg/apis/meta/v1alpha1"
 	"github.com/weaveworks/ignite/pkg/storage"
 	"github.com/weaveworks/ignite/pkg/storage/filterer"
-
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 

diff --git a/pkg/client/zz_generated.client_kernel.go b/pkg/client/zz_generated.client_kernel.go
@@ -1,4 +1,3 @@
-
 /*
 	Note: This file is autogenerated! Do not edit it manually!
 	Edit client_kernel_template.go instead, and run
@@ -15,7 +14,6 @@ import (
 	meta "github.com/weaveworks/ignite/pkg/apis/meta/v1alpha1"
 	"github.com/weaveworks/ignite/pkg/storage"
 	"github.com/weaveworks/ignite/pkg/storage/filterer"
-
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 

diff --git a/pkg/client/zz_generated.client_vm.go b/pkg/client/zz_generated.client_vm.go
@@ -1,4 +1,3 @@
-
 /*
 	Note: This file is autogenerated! Do not edit it manually!
 	Edit client_vm_template.go instead, and run
@@ -15,7 +14,6 @@ import (
 	meta "github.com/weaveworks/ignite/pkg/apis/meta/v1alpha1"
 	"github.com/weaveworks/ignite/pkg/storage"
 	"github.com/weaveworks/ignite/pkg/storage/filterer"
-
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 

diff --git a/pkg/gitops/gitops.go b/pkg/gitops/gitops.go
@@ -13,7 +13,7 @@ import (
 	"github.com/weaveworks/ignite/pkg/dmlegacy"
 	"github.com/weaveworks/ignite/pkg/gitops/gitdir"
 	"github.com/weaveworks/ignite/pkg/operations"
-	"github.com/weaveworks/ignite/pkg/storage"
+	"github.com/weaveworks/ignite/pkg/storage/cache"
 	"github.com/weaveworks/ignite/pkg/storage/manifest"
 	"github.com/weaveworks/ignite/pkg/util"
 )
@@ -35,7 +35,7 @@ func RunLoop(url, branch string) error {
 	// Construct a manifest storage for the path backed by git
 	s := manifest.NewManifestStorage(dataDir)
 	// Wrap the Manifest Storage with a cache for better performance, and create a client
-	c = client.NewClient(storage.NewCache(s))
+	c = client.NewClient(cache.NewCache(s))
 	// Construct the GitDirectory implementation which backs the storage
 	gitDir = gitdir.NewGitDirectory(url, dataDir, branch, syncInterval)
 	// Start the GitDirectory sync loop

diff --git a/pkg/providers/storage.go b/pkg/providers/storage.go
@@ -4,13 +4,14 @@ import (
 	"github.com/weaveworks/ignite/pkg/apis/ignite/scheme"
 	"github.com/weaveworks/ignite/pkg/constants"
 	"github.com/weaveworks/ignite/pkg/storage"
+	"github.com/weaveworks/ignite/pkg/storage/cache"
 )
 
 // Storage is the default storage implementation
 var Storage storage.Storage
 
 func SetCachedStorage() error {
-	Storage = storage.NewCache(
+	Storage = cache.NewCache(
 		storage.NewGenericStorage(
 			storage.NewDefaultRawStorage(constants.DATA_DIR), scheme.Serializer))
 	return nil

diff --git a/pkg/storage/cache.go b/pkg/storage/cache.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ import ( @@
     	api "github.com/weaveworks/ignite/pkg/apis/ignite"
     	meta "github.com/weaveworks/ignite/pkg/apis/meta/v1alpha1"
     	"k8s.io/apimachinery/pkg/util/validation/field"
     )
@@ Expand Down @@