send file

projecteru2 · Mar 6, 2020 · 669aef8 · 669aef8
1 parent 0ce475f
commit 669aef8
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/cluster/calcium/send.go b/cluster/calcium/send.go
@@ -3,7 +3,6 @@ package calcium
 import (
 	"context"
 	"os"
-	"path/filepath"
 	"sync"
 
 	"github.com/projecteru2/core/engine"
@@ -42,13 +41,12 @@ func (c *Calcium) Send(ctx context.Context, opts *types.SendOptions) (chan *type
 }
 
 func (c *Calcium) doSendFileToContainer(ctx context.Context, engine engine.API, ID, dst, src string, AllowOverwriteDirWithFile bool, CopyUIDGID bool) error {
-	path := filepath.Dir(dst)
 	log.Infof("[doSendFileToContainer] Send file to %s:%s", ID, dst)
 	log.Debugf("[doSendFileToContainer] Local file %s, remote path %s", src, dst)
 	f, err := os.Open(src)
 	if err != nil {
 		return err
 	}
 	defer f.Close()
-	return engine.VirtualizationCopyTo(ctx, ID, path, f, AllowOverwriteDirWithFile, CopyUIDGID)
+	return engine.VirtualizationCopyTo(ctx, ID, dst, f, AllowOverwriteDirWithFile, CopyUIDGID)
 }
diff --git a/engine/docker/container.go b/engine/docker/container.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"path/filepath"
 
 	"github.com/docker/go-connections/nat"
 	"github.com/docker/go-units"
@@ -192,7 +193,7 @@ func (e *Engine) VirtualizationCreate(ctx context.Context, opts *enginetypes.Vir
 
 // VirtualizationCopyTo copy things to virtualization
 func (e *Engine) VirtualizationCopyTo(ctx context.Context, ID, path string, content io.Reader, AllowOverwriteDirWithFile, CopyUIDGID bool) error {
-	return e.client.CopyToContainer(ctx, ID, path, content, dockertypes.CopyToContainerOptions{AllowOverwriteDirWithFile: AllowOverwriteDirWithFile, CopyUIDGID: CopyUIDGID})
+	return e.client.CopyToContainer(ctx, ID, filepath.Dir(path), content, dockertypes.CopyToContainerOptions{AllowOverwriteDirWithFile: AllowOverwriteDirWithFile, CopyUIDGID: CopyUIDGID})
 }
 
 // VirtualizationStart start virtualization

diff --git a/engine/systemd/systemd.go b/engine/systemd/systemd.go
@@ -13,6 +13,8 @@ import (
 	enginetypes "github.com/projecteru2/core/engine/types"
 	coretypes "github.com/projecteru2/core/types"
 	"golang.org/x/crypto/ssh"
+
+	log "github.com/sirupsen/logrus"
 )
 
 const (
@@ -102,6 +104,7 @@ func (s *SystemdSSH) ResourceValidate(ctx context.Context, cpu float64, cpumap m
 
 func (s *SystemdSSH) runSingleCommand(ctx context.Context, cmd string, stdin io.Reader) (stdout, stderr *bytes.Buffer, err error) {
 	// what a pathetic library that leaves context completely useless
+	log.Debugf("[runSingleCommand] %s", cmd)
 
 	stdout = &bytes.Buffer{}
 	stderr = &bytes.Buffer{}

diff --git a/engine/systemd/virtualization.go b/engine/systemd/virtualization.go
@@ -25,7 +25,16 @@ const (
 
 func (s *SystemdSSH) VirtualizationCreate(ctx context.Context, opts *enginetypes.VirtualizationCreateOptions) (created *enginetypes.VirtualizationCreated, err error) {
 	ID := "SYSTEMD-" + utils.RandomString(46)
-	buffer, err := s.newUnitBuilder(ID, opts).buildUnit().buildPreExec().buildExec().buildPostExec().buffer()
+
+	cpuAmount, err := s.CPUInfo(ctx)
+	if err != nil {
+		return
+	}
+	buffer, err := s.newUnitBuilder(ID, opts).buildUnit().buildPreExec(cpuAmount).buildExec().buildPostExec().buffer()
+	if err != nil {
+		return
+	}
+
 	// cp - /usr/local/lib/systemd/system/
 	if err = s.VirtualizationCopyTo(ctx, "", getUnitFilename(ID), buffer, true, true); err != nil {
 		return