diff --git a/app/app.go b/app/app.go
index 85bb623..0da2b82 100644
--- a/app/app.go
+++ b/app/app.go
@@ -67,50 +67,50 @@ func Run() {
})
router.GET("/nodes/:node", func(c *gin.Context) {
- node := c.Param("node")
+ nodeid := c.Param("node")
- host, err := cluster.GetHost(node)
+ node, err := cluster.GetNode(nodeid)
if err != nil {
- c.JSON(http.StatusInternalServerError, gin.H{"error": err})
+ c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
} else {
- c.JSON(http.StatusOK, gin.H{"node": host})
+ c.JSON(http.StatusOK, gin.H{"node": node})
return
}
})
router.GET("/nodes/:node/devices", func(c *gin.Context) {
- node := c.Param("node")
+ nodeid := c.Param("node")
- host, err := cluster.GetHost(node)
+ node, err := cluster.GetNode(nodeid)
if err != nil {
- c.JSON(http.StatusInternalServerError, gin.H{"error": err})
+ c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
} else {
- c.JSON(http.StatusOK, gin.H{"devices": host.Devices})
+ c.JSON(http.StatusOK, gin.H{"devices": node.Devices})
return
}
})
- router.GET("/nodes/:node/instances/:instance", func(c *gin.Context) {
- node := c.Param("node")
- vmid, err := strconv.ParseUint(c.Param("instance"), 10, 64)
+ router.GET("/nodes/:node/instances/:vmid", func(c *gin.Context) {
+ nodeid := c.Param("node")
+ vmid, err := strconv.ParseUint(c.Param("vmid"), 10, 64)
if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("%s could not be converted to vmid (uint)", c.Param("instance"))})
return
}
- host, err := cluster.GetHost(node)
+ node, err := cluster.GetNode(nodeid)
if err != nil {
- c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("vmid %s not found in cluster", node)})
+ c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
} else {
- instance, err := host.GetInstance(uint(vmid))
+ instance, err := node.GetInstance(uint(vmid))
if err != nil {
- c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("%d not found in %s", vmid, node)})
+ c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
} else {
c.JSON(http.StatusOK, gin.H{"instance": instance})
@@ -119,5 +119,65 @@ func Run() {
}
})
+ router.POST("/sync", func(c *gin.Context) {
+ go func() {
+ start := time.Now()
+ log.Printf("Starting cluster sync\n")
+ cluster.Sync()
+ log.Printf("Synced cluster in %fs\n", time.Since(start).Seconds())
+ }()
+ })
+
+ router.POST("/nodes/:node/sync", func(c *gin.Context) {
+ nodeid := c.Param("node")
+ go func() {
+ start := time.Now()
+ log.Printf("Starting %s sync\n", nodeid)
+ err := cluster.RebuildHost(nodeid)
+ if err != nil {
+ log.Printf("Failed to sync %s: %s", nodeid, err.Error())
+ return
+ } else {
+ log.Printf("Synced %s in %fs\n", nodeid, time.Since(start).Seconds())
+ return
+ }
+ }()
+ })
+
+ router.POST("/nodes/:node/instances/:vmid/sync", func(c *gin.Context) {
+ nodeid := c.Param("node")
+ vmid, err := strconv.ParseUint(c.Param("vmid"), 10, 64)
+ if err != nil {
+ c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("%s could not be converted to vmid (uint)", c.Param("instance"))})
+ return
+ }
+
+ go func() {
+ start := time.Now()
+ log.Printf("Starting %s.%d sync\n", nodeid, vmid)
+
+ node, err := cluster.GetNode(nodeid)
+ if err != nil {
+ log.Printf("Failed to sync %s.%d: %s", nodeid, vmid, err.Error())
+ return
+ }
+
+ instance, err := node.GetInstance(uint(vmid))
+ if err != nil {
+ log.Printf("Failed to sync %s.%d: %s", nodeid, vmid, err.Error())
+ return
+ }
+
+ err = node.RebuildInstance(instance.Type, uint(vmid))
+ if err != nil {
+ log.Printf("Failed to sync %s.%d: %s", nodeid, vmid, err.Error())
+ return
+ } else {
+ log.Printf("Synced %s.%d in %fs\n", nodeid, vmid, time.Since(start).Seconds())
+ return
+ }
+ }()
+ })
+
router.Run("0.0.0.0:" + strconv.Itoa(config.ListenPort))
}
diff --git a/app/model.go b/app/model.go
index 2435a65..8c4e06b 100644
--- a/app/model.go
+++ b/app/model.go
@@ -15,7 +15,7 @@ func (cluster *Cluster) Sync() error {
cluster.lock.Lock()
defer cluster.lock.Unlock()
- cluster.Hosts = make(map[string]*Host)
+ cluster.Nodes = make(map[string]*Node)
// get all nodes
nodes, err := cluster.pve.Nodes()
@@ -35,8 +35,8 @@ func (cluster *Cluster) Sync() error {
}
// get a node in the cluster
-func (cluster *Cluster) GetHost(hostName string) (*Host, error) {
- host_ch := make(chan *Host)
+func (cluster *Cluster) GetNode(hostName string) (*Node, error) {
+ host_ch := make(chan *Node)
err_ch := make(chan error)
go func() {
@@ -44,21 +44,23 @@ func (cluster *Cluster) GetHost(hostName string) (*Host, error) {
cluster.lock.Lock()
defer cluster.lock.Unlock()
// get host
- host, ok := cluster.Hosts[hostName]
+ host, ok := cluster.Nodes[hostName]
if !ok {
host_ch <- nil
err_ch <- fmt.Errorf("%s not in cluster", hostName)
- }
- // aquire host lock to wait in case of a concurrent write
- host.lock.Lock()
- defer host.lock.Unlock()
+ } else {
+ // aquire host lock to wait in case of a concurrent write
+ host.lock.Lock()
+ defer host.lock.Unlock()
- host_ch <- host
- err_ch <- nil
+ host_ch <- host
+ err_ch <- nil
+ }
}()
host := <-host_ch
err := <-err_ch
+
return host, err
}
@@ -72,7 +74,7 @@ func (cluster *Cluster) RebuildHost(hostName string) error {
host.lock.Lock()
defer host.lock.Unlock()
- cluster.Hosts[hostName] = host
+ cluster.Nodes[hostName] = host
// get node's VMs
vms, err := host.VirtualMachines()
@@ -81,7 +83,7 @@ func (cluster *Cluster) RebuildHost(hostName string) error {
}
for _, vmid := range vms {
- err := host.RebuildVM(vmid)
+ err := host.RebuildInstance(VM, vmid)
if err != nil {
return err
}
@@ -93,7 +95,7 @@ func (cluster *Cluster) RebuildHost(hostName string) error {
return err
}
for _, vmid := range cts {
- err := host.RebuildCT(vmid)
+ err := host.RebuildInstance(CT, vmid)
if err != nil {
return err
}
@@ -102,7 +104,7 @@ func (cluster *Cluster) RebuildHost(hostName string) error {
return nil
}
-func (host *Host) GetInstance(vmid uint) (*Instance, error) {
+func (host *Node) GetInstance(vmid uint) (*Instance, error) {
instance_ch := make(chan *Instance)
err_ch := make(chan error)
@@ -115,13 +117,14 @@ func (host *Host) GetInstance(vmid uint) (*Instance, error) {
if !ok {
instance_ch <- nil
err_ch <- fmt.Errorf("vmid %d not in host %s", vmid, host.Name)
- }
- // aquire instance lock to wait in case of a concurrent write
- instance.lock.Lock()
- defer instance.lock.Unlock()
+ } else {
+ // aquire instance lock to wait in case of a concurrent write
+ instance.lock.Lock()
+ defer instance.lock.Unlock()
- instance_ch <- instance
- err_ch <- nil
+ instance_ch <- instance
+ err_ch <- nil
+ }
}()
instance := <-instance_ch
@@ -129,10 +132,21 @@ func (host *Host) GetInstance(vmid uint) (*Instance, error) {
return instance, err
}
-func (host *Host) RebuildVM(vmid uint) error {
- instance, err := host.VirtualMachine(vmid)
- if err != nil {
- return err
+func (host *Node) RebuildInstance(instancetype InstanceType, vmid uint) error {
+ var instance *Instance
+ if instancetype == VM {
+ var err error
+ instance, err = host.VirtualMachine(vmid)
+ if err != nil {
+ return err
+ }
+ } else if instancetype == CT {
+ var err error
+ instance, err = host.Container(vmid)
+ if err != nil {
+ return err
+ }
+
}
// aquire lock on instance, release on return
@@ -156,33 +170,10 @@ func (host *Host) RebuildVM(vmid uint) error {
return nil
}
-func (host *Host) RebuildCT(vmid uint) error {
- instance, err := host.Container(vmid)
- if err != nil {
- return err
- }
-
- // aquire lock on instance, release on return
- instance.lock.Lock()
- defer instance.lock.Unlock()
-
- host.Instances[vmid] = instance
-
- for volid := range instance.configDisks {
- instance.RebuildVolume(host, volid)
- }
-
- for netid := range instance.configNets {
- instance.RebuildNet(netid)
- }
-
- return nil
-}
-
-func (instance *Instance) RebuildVolume(host *Host, volid string) error {
+func (instance *Instance) RebuildVolume(host *Node, volid string) error {
volumeDataString := instance.configDisks[volid]
- volume, _, _, err := GetVolumeInfo(host, volumeDataString)
+ volume, err := GetVolumeInfo(host, volumeDataString)
if err != nil {
return err
}
@@ -209,7 +200,7 @@ func (instance *Instance) RebuildNet(netid string) error {
return nil
}
-func (instance *Instance) RebuildDevice(host *Host, deviceid string) error {
+func (instance *Instance) RebuildDevice(host *Node, deviceid string) error {
instanceDevice, ok := instance.configHostPCIs[deviceid]
if !ok { // if device does not exist
return fmt.Errorf("%s not found in devices", deviceid)
diff --git a/app/proxmox.go b/app/proxmox.go
index 67b05f4..3793d7c 100644
--- a/app/proxmox.go
+++ b/app/proxmox.go
@@ -57,8 +57,8 @@ func (pve ProxmoxClient) Nodes() ([]string, error) {
}
// Gets a Node's resources but does not recursively expand instances
-func (pve ProxmoxClient) Node(nodeName string) (*Host, error) {
- host := Host{}
+func (pve ProxmoxClient) Node(nodeName string) (*Node, error) {
+ host := Node{}
host.Devices = make(map[string]*Device)
host.Instances = make(map[uint]*Instance)
@@ -87,7 +87,7 @@ func (pve ProxmoxClient) Node(nodeName string) (*Host, error) {
}
// Get all VM IDs on specified host
-func (host *Host) VirtualMachines() ([]uint, error) {
+func (host *Node) VirtualMachines() ([]uint, error) {
vms, err := host.pvenode.VirtualMachines(context.Background())
if err != nil {
return nil, err
@@ -100,7 +100,7 @@ func (host *Host) VirtualMachines() ([]uint, error) {
}
// Get a VM's CPU, Memory but does not recursively link Devices, Disks, Drives, Nets
-func (host *Host) VirtualMachine(VMID uint) (*Instance, error) {
+func (host *Node) VirtualMachine(VMID uint) (*Instance, error) {
instance := Instance{}
vm, err := host.pvenode.VirtualMachine(context.Background(), int(VMID))
if err != nil {
@@ -135,7 +135,7 @@ func MergeVMDisksAndUnused(vmc *proxmox.VirtualMachineConfig) map[string]string
}
// Get all CT IDs on specified host
-func (host *Host) Containers() ([]uint, error) {
+func (host *Node) Containers() ([]uint, error) {
cts, err := host.pvenode.Containers(context.Background())
if err != nil {
return nil, err
@@ -148,7 +148,7 @@ func (host *Host) Containers() ([]uint, error) {
}
// Get a CT's CPU, Memory, Swap but does not recursively link Devices, Disks, Drives, Nets
-func (host *Host) Container(VMID uint) (*Instance, error) {
+func (host *Node) Container(VMID uint) (*Instance, error) {
instance := Instance{}
ct, err := host.pvenode.Container(context.Background(), int(VMID))
if err != nil {
@@ -185,31 +185,32 @@ func MergeCTDisksAndUnused(cc *proxmox.ContainerConfig) map[string]string {
return mergedDisks
}
-// get volume fornmat, size, volumeid, and storageid from instance volume data string (eg: local:100/vm-100-disk-0.raw ... )
-func GetVolumeInfo(host *Host, volume string) (*Volume, string, string, error) {
+// get volume format, size, volumeid, and storageid from instance volume data string (eg: local:100/vm-100-disk-0.raw ... )
+func GetVolumeInfo(host *Node, volume string) (*Volume, error) {
volumeData := Volume{}
storageID := strings.Split(volume, ":")[0]
volumeID := strings.Split(volume, ",")[0]
storage, err := host.pvenode.Storage(context.Background(), storageID)
if err != nil {
- return &volumeData, volumeID, storageID, nil
+ return &volumeData, nil
}
content, err := storage.GetContent(context.Background())
if err != nil {
- return &volumeData, volumeID, storageID, nil
+ return &volumeData, nil
}
for _, c := range content {
if c.Volid == volumeID {
+ volumeData.Storage = storageID
volumeData.Format = c.Format
volumeData.Size = uint64(c.Size)
volumeData.Volid = volumeID
}
}
- return &volumeData, volumeID, storageID, nil
+ return &volumeData, nil
}
func GetNetInfo(net string) (*Net, error) {
diff --git a/app/types.go b/app/types.go
index ce3aa3a..1ced31f 100644
--- a/app/types.go
+++ b/app/types.go
@@ -9,17 +9,17 @@ import (
type Cluster struct {
lock sync.Mutex
pve ProxmoxClient
- Hosts map[string]*Host
+ Nodes map[string]*Node
}
-type Host struct {
+type Node struct {
lock sync.Mutex
- Name string
- Cores uint64
- Memory uint64
- Swap uint64
- Devices map[string]*Device
- Instances map[uint]*Instance
+ Name string `json:"name"`
+ Cores uint64 `json:"cores"`
+ Memory uint64 `json:"memory"`
+ Swap uint64 `json:"swap"`
+ Devices map[string]*Device `json:"devices"`
+ Instances map[uint]*Instance `json:"instances"`
pvenode *proxmox.Node
}
@@ -32,15 +32,15 @@ const (
type Instance struct {
lock sync.Mutex
- Type InstanceType
- Name string
- Proctype string
- Cores uint64
- Memory uint64
- Swap uint64
- Volumes map[string]*Volume
- Nets map[uint]*Net
- Devices map[uint][]*Device
+ Type InstanceType `json:"type"`
+ Name string `json:"name"`
+ Proctype string `json:"cpu"`
+ Cores uint64 `json:"cores"`
+ Memory uint64 `json:"memory"`
+ Swap uint64 `json:"swap"`
+ Volumes map[string]*Volume `json:"volumes"`
+ Nets map[uint]*Net `json:"nets"`
+ Devices map[uint][]*Device `json:"devices"`
pveconfig interface{}
configDisks map[string]string
configNets map[string]string
@@ -48,15 +48,15 @@ type Instance struct {
}
type Volume struct {
- Path string
- Format string
- Size uint64
- Volid string
+ Storage string `json:"storage"`
+ Format string `json:"format"`
+ Size uint64 `json:"size"`
+ Volid string `json:"volid"`
}
type Net struct {
- Rate uint64
- VLAN uint64
+ Rate uint64 `json:"rate"`
+ VLAN uint64 `json:"vlan"`
}
type Device struct {
@@ -65,5 +65,5 @@ type Device struct {
VendorName string `json:"vendor_name"`
SubsystemDeviceName string `json:"subsystem_device_name"`
SubsystemVendorName string `json:"subsystem_vendor_name"`
- Reserved bool
+ Reserved bool `json:"reserved"`
}