diff --git a/pkg/scheduler/cache/sync/default.go b/pkg/scheduler/cache/sync/default.go index 96ee6c3f72..8d6f8121bf 100644 --- a/pkg/scheduler/cache/sync/default.go +++ b/pkg/scheduler/cache/sync/default.go @@ -21,9 +21,9 @@ func getUpdate(d []interface{}) ([]string, error) { func defaultSyncItems() []cache.CachedItem { return []cache.CachedItem{ - //newGlanceCache(), - //newNetworkCache(), - //newNetworksDataCache(), + //newGlanceCache(), + //newNetworkCache(), + //newNetworksDataCache(), } } diff --git a/pkg/scheduler/manager/task_queue.go b/pkg/scheduler/manager/task_queue.go index f71cc3f2a7..125ab24e21 100644 --- a/pkg/scheduler/manager/task_queue.go +++ b/pkg/scheduler/manager/task_queue.go @@ -200,8 +200,8 @@ type TaskManager struct { func NewTaskManager(stopCh <-chan struct{}) *TaskManager { return &TaskManager{ taskExecutorQueueManager: NewTaskExecutorQueueManager(stopCh), - stopCh: stopCh, - lock: sync.Mutex{}, + stopCh: stopCh, + lock: sync.Mutex{}, } } diff --git a/pkg/util/aliyun/provider/provider.go b/pkg/util/aliyun/provider/provider.go index eefa67c22e..3cbc985c7b 100644 --- a/pkg/util/aliyun/provider/provider.go +++ b/pkg/util/aliyun/provider/provider.go @@ -46,7 +46,7 @@ func (self *SAliyunProviderFactory) GetProvider(providerId, providerName, url, a func init() { factory := SAliyunProviderFactory{ - // providerTable: make(map[string]*SAliyunProvider), + // providerTable: make(map[string]*SAliyunProvider), } cloudprovider.RegisterFactory(&factory) } diff --git a/pkg/util/rbacutils/rabc.go b/pkg/util/rbacutils/rabc.go index 5bca77f3a1..3c11d60d45 100644 --- a/pkg/util/rbacutils/rabc.go +++ b/pkg/util/rbacutils/rabc.go @@ -163,6 +163,9 @@ func (policy *SRbacPolicy) GetMatchRule(service string, resource string, action } func CompactRules(rules []SRbacRule) []SRbacRule { + if len(rules) == 0 { + return nil + } output := make([]SRbacRule, 1) output[0] = rules[0] for i := 1; i < len(rules); i += 1 { @@ -199,6 +202,10 @@ func (policy *SRbacPolicy) Decode(policyJson jsonutils.JSONObject) error { return err } + if len(rules) == 0 { + return fmt.Errorf("empty policy") + } + policy.Rules = CompactRules(rules) return nil