Sorry for the size of this patch, I was busy hacking and plumbing away and it got out of hand! I'm allowing this because there doesn't seem to be anyone hacking away on parts of the code that this would break, since the resource code is fairly stable in this change. In particular, it revisits and refreshes some areas of the code that didn't see anything new or innovative since the project first started. I've gotten rid of a lot of cruft, and in particular cleaned up some things that I didn't know how to do better before! Here's hoping I'll continue to learn and have more to improve upon in the future! (Well let's not hope _too_ hard though!) The logical goal of this patch was to make logical grouping of resources possible. For example, it might be more efficient to group three package installations into a single transaction, instead of having to run three separate transactions. This is because a package installation typically has an initial one-time per run cost which shouldn't need to be repeated. Another future goal would be to group file resources sharing a common base path under a common recursive fanotify watcher. Since this depends on fanotify capabilities first, this hasn't been implemented yet, but could be a useful method of reducing the number of separate watches needed, since there is a finite limit. It's worth mentioning that grouping resources typically _reduces_ the parallel execution capability of a particular graph, but depending on the cost/benefit tradeoff, this might be preferential. I'd submit it's almost universally beneficial for pkg resources. This monster patch includes: * the autogroup feature * the grouping interface * a placeholder algorithm * an extensive test case infrastructure to test grouping algorithms * a move of some base resource methods into pgraph refactoring * some config/compile clean ups to remove code duplication * b64 encoding/decoding improvements * a rename of the yaml "res" entries to "kind" (more logical) * some docs * small fixes * and more!
142 lines
3.6 KiB
Go
142 lines
3.6 KiB
Go
// Mgmt
|
|
// Copyright (C) 2013-2016+ James Shubin and the project contributors
|
|
// Written by James Shubin <james@shubin.ca> and the project contributors
|
|
//
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Affero General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Affero General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Affero General Public License
|
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package main
|
|
|
|
import (
|
|
"encoding/gob"
|
|
"log"
|
|
)
|
|
|
|
func init() {
|
|
gob.Register(&NoopRes{})
|
|
}
|
|
|
|
type NoopRes struct {
|
|
BaseRes `yaml:",inline"`
|
|
Comment string `yaml:"comment"` // extra field for example purposes
|
|
}
|
|
|
|
func NewNoopRes(name string) *NoopRes {
|
|
obj := &NoopRes{
|
|
BaseRes: BaseRes{
|
|
Name: name,
|
|
},
|
|
Comment: "",
|
|
}
|
|
obj.Init()
|
|
return obj
|
|
}
|
|
|
|
func (obj *NoopRes) Init() {
|
|
obj.BaseRes.kind = "Noop"
|
|
obj.BaseRes.Init() // call base init, b/c we're overriding
|
|
}
|
|
|
|
// validate if the params passed in are valid data
|
|
// FIXME: where should this get called ?
|
|
func (obj *NoopRes) Validate() bool {
|
|
return true
|
|
}
|
|
|
|
func (obj *NoopRes) Watch(processChan chan struct{}) {
|
|
if obj.IsWatching() {
|
|
return
|
|
}
|
|
obj.SetWatching(true)
|
|
defer obj.SetWatching(false)
|
|
|
|
//vertex := obj.vertex // stored with SetVertex
|
|
var send = false // send event?
|
|
var exit = false
|
|
for {
|
|
obj.SetState(resStateWatching) // reset
|
|
select {
|
|
case event := <-obj.events:
|
|
obj.SetConvergedState(resConvergedNil)
|
|
// we avoid sending events on unpause
|
|
if exit, send = obj.ReadEvent(&event); exit {
|
|
return // exit
|
|
}
|
|
|
|
case _ = <-TimeAfterOrBlock(obj.ctimeout):
|
|
obj.SetConvergedState(resConvergedTimeout)
|
|
obj.converged <- true
|
|
continue
|
|
}
|
|
|
|
// do all our event sending all together to avoid duplicate msgs
|
|
if send {
|
|
send = false
|
|
// only do this on certain types of events
|
|
//obj.isStateOK = false // something made state dirty
|
|
processChan <- struct{}{} // trigger process
|
|
}
|
|
}
|
|
}
|
|
|
|
// CheckApply method for Noop resource. Does nothing, returns happy!
|
|
func (obj *NoopRes) CheckApply(apply bool) (stateok bool, err error) {
|
|
log.Printf("%v[%v]: CheckApply(%t)", obj.Kind(), obj.GetName(), apply)
|
|
return true, nil // state is always okay
|
|
}
|
|
|
|
type NoopUUID struct {
|
|
BaseUUID
|
|
name string
|
|
}
|
|
|
|
func (obj *NoopRes) AutoEdges() AutoEdge {
|
|
return nil
|
|
}
|
|
|
|
// include all params to make a unique identification of this object
|
|
// most resources only return one, although some resources return multiple
|
|
func (obj *NoopRes) GetUUIDs() []ResUUID {
|
|
x := &NoopUUID{
|
|
BaseUUID: BaseUUID{name: obj.GetName(), kind: obj.Kind()},
|
|
name: obj.Name,
|
|
}
|
|
return []ResUUID{x}
|
|
}
|
|
|
|
func (obj *NoopRes) GroupCmp(r Res) bool {
|
|
_, ok := r.(*NoopRes)
|
|
if !ok {
|
|
// NOTE: technically we could group a noop into any other
|
|
// resource, if that resource knew how to handle it, although,
|
|
// since the mechanics of inter-kind resource grouping are
|
|
// tricky, avoid doing this until there's a good reason.
|
|
return false
|
|
}
|
|
return true // noop resources can always be grouped together!
|
|
}
|
|
|
|
func (obj *NoopRes) Compare(res Res) bool {
|
|
switch res.(type) {
|
|
// we can only compare NoopRes to others of the same resource
|
|
case *NoopRes:
|
|
res := res.(*NoopRes)
|
|
if obj.Name != res.Name {
|
|
return false
|
|
}
|
|
default:
|
|
return false
|
|
}
|
|
return true
|
|
}
|