forked from aws/amazon-ecs-agent
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
7 changed files
with
200 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 1.87.0 | ||
| 1.87.0-firecamp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| package engine | ||
|
|
||
| import ( | ||
| "errors" | ||
| "strings" | ||
|
|
||
| api "github.com/aws/amazon-ecs-agent/agent/api/container" | ||
|
|
||
| "github.com/cihub/seelog" | ||
| docker "github.com/docker/docker/api/types/container" | ||
| ) | ||
|
|
||
| type VolumeDriverConfigError struct { | ||
| msg string | ||
| } | ||
|
|
||
| func (err *VolumeDriverConfigError) Error() string { return err.msg } | ||
| func (err *VolumeDriverConfigError) ErrorName() string { return "VolumeDriverConfigError" } | ||
|
|
||
| // Define here again to avoid the dependency on githut.com/cloudstax/firecamp | ||
| const ( | ||
| org = "jazzl0ver/" | ||
| volumeDriver = org + "firecamp-volume" | ||
| logDriver = org + "firecamp-log" | ||
| logGroupKey = "awslogs-group" | ||
| logServiceUUIDKey = "ServiceUUID" | ||
| logDriverMinVersion = "0.9.3" | ||
| versionKey = "VERSION" | ||
| ) | ||
|
|
||
| // Create a taskDefinition at AWS ECS console, created one volume, "Name" my-ecs-volume, | ||
| // "Source Path" /test-volume. Then in "Container Definitions", create "Mount Points", | ||
| // "Container Path" /usr/test-volume, "Source Volume" my-ecs-volume. | ||
| // | ||
| // ECS will not pass my-ecs-volume to agent. agent.createContainer() will directly get | ||
| // "/test-volume:/usr/test-volume" in docker.HostConfig. | ||
| // So to pass in the ServiceUUID, when creating volume at ECS console, should set both | ||
| // "Name" and "Source Path" to ServiceUUID. | ||
| // | ||
| // docker.Config is not the place for volume. At createContainer(), task.DockerConfig() | ||
| // calls task.dockerConfigVolumes(), which looks does nothing. comments say, "you can | ||
| // handle most volume mount types in the HostConfig at run-time". | ||
|
|
||
| // AddVolumeDriver updates the docker container volume config, if the task | ||
| // belongs to the service registered to us. | ||
| // update HostConfig with "-v volumename:/data --volume-driver=ourDriver" | ||
| func AddVolumeDriver(hostConfig *docker.HostConfig, container *api.Container, cluster string, taskArn string, taskDef string) (newConfig *docker.HostConfig, err *VolumeDriverConfigError) { | ||
| if isFirecampService, serviceUUID := setVolumeDriver(hostConfig, cluster, taskArn, taskDef); isFirecampService { | ||
| // get the volume driver version from environment | ||
| version, ok := container.Environment[versionKey] | ||
| if !ok { | ||
| err := errors.New("firecamp container environment does not have version") | ||
| seelog.Error("firecamp container environment does not have version", container.Environment, | ||
| "cluster", cluster, "taskArn", taskArn, "taskDef", taskDef) | ||
| return nil, &VolumeDriverConfigError{err.Error()} | ||
| } | ||
|
|
||
| // set volume-driver in docker HostConfig | ||
| hostConfig.VolumeDriver = volumeDriver + ":" + version | ||
|
|
||
| // set the log driver in docker HostConfig | ||
| if version >= logDriverMinVersion { | ||
| hostConfig.LogConfig = docker.LogConfig{ | ||
| Type: logDriver + ":" + version, | ||
| Config: map[string]string{ | ||
| logGroupKey: hostConfig.LogConfig.Config[logGroupKey], | ||
| logServiceUUIDKey: serviceUUID, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| seelog.Info("add firecamp log driver", hostConfig.LogConfig, "and volume driver", hostConfig.VolumeDriver, | ||
| "to HostConfig Binds", hostConfig.Binds, | ||
| "cluster", cluster, "taskArn", taskArn, "taskDef", taskDef) | ||
| } | ||
|
|
||
| return hostConfig, nil | ||
| } | ||
|
|
||
| func setVolumeDriver(hostConfig *docker.HostConfig, cluster string, taskArn string, taskDef string) (isFirecampService bool, serviceUUID string) { | ||
| if len(hostConfig.VolumesFrom) != 0 { | ||
| seelog.Info("task HostConfig has VolumeFrom, not a valid volume, cluster", | ||
| cluster, "taskArn", taskArn, "taskDef", taskDef) | ||
| return false, "" | ||
| } | ||
|
|
||
| if len(hostConfig.Binds) == 0 || len(hostConfig.Binds) > 2 { | ||
| // some service, such as Cassandra, has 2 volumes. One for journal, one for data. | ||
| seelog.Info("HostConfig binds 0 volume or more than 2 volume2", hostConfig.Binds, | ||
| "cluster", cluster, "taskArn", taskArn, "taskDef", taskDef) | ||
| return false, "" | ||
| } | ||
|
|
||
| // binds one volume, further check whether is valid volume. | ||
| // currently only support one volume per task | ||
|
|
||
| // check if HostConfig Binds is correct, should be ServiceUUID:/mountPathInContainer | ||
| // TODO we should add firecamp as prefix, such as firecamp-ServiceUUID:/mountPathInContainer | ||
| volSep := ":/" | ||
| s := strings.Split(hostConfig.Binds[0], volSep) | ||
| if len(s) != 2 { | ||
| seelog.Info("Bad HostConfig Binds", hostConfig.Binds, | ||
| "cluster", cluster, "taskArn", taskArn, "taskDef", taskDef) | ||
| return false, "" | ||
| } | ||
|
|
||
| // TODO should we check if service is created in DB? For now, ECS allows non-path | ||
| // style "Source Path" for one volume. | ||
| if strings.HasPrefix(s[0], "/") { | ||
| seelog.Info("HostConfig Binds is for local path", hostConfig.Binds, | ||
| "cluster", cluster, "taskArn", taskArn, "taskDef", taskDef) | ||
| return false, "" | ||
| } | ||
|
|
||
| seelog.Info("HostConfig binds the valid volume", hostConfig.Binds, | ||
| "cluster", cluster, "taskArn", taskArn, "taskDef", taskDef) | ||
| return true, s[0] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| package engine | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| docker "github.com/docker/docker/api/types/container" | ||
| ) | ||
|
|
||
| func TestDockerConfig(t *testing.T) { | ||
| cluster := "cluster1" | ||
| taskArn := "task1" | ||
| taskDef := "taskDef1" | ||
| hostConfig := &docker.HostConfig{} | ||
|
|
||
| binds := make([]string, 2) | ||
|
|
||
| // negative case, no volume | ||
| set, suuid := setVolumeDriver(hostConfig, cluster, taskArn, taskDef) | ||
| if set { | ||
| t.Fatalf("expect not valid volume for HostConfig %+v", hostConfig) | ||
| } | ||
|
|
||
| // negative case, has VolumesFrom | ||
| binds[0] = "/test-volume:/usr/test-volume" | ||
| hostConfig.VolumesFrom = binds | ||
| set, suuid = setVolumeDriver(hostConfig, cluster, taskArn, taskDef) | ||
| if set { | ||
| t.Fatalf("expect not valid volume for HostConfig %+v", hostConfig) | ||
| } | ||
|
|
||
| // negative case, binds 1 local volume | ||
| hostConfig.VolumesFrom = nil | ||
| hostConfig.Binds = binds | ||
| set, suuid = setVolumeDriver(hostConfig, cluster, taskArn, taskDef) | ||
| if set { | ||
| t.Fatalf("expect not valid volume for HostConfig %+v", hostConfig) | ||
| } | ||
|
|
||
| // negative case, binds 2 volumes | ||
| binds[1] = "/vol2:/usr/vol2" | ||
| hostConfig.Binds = binds | ||
| set, suuid = setVolumeDriver(hostConfig, cluster, taskArn, taskDef) | ||
| if set { | ||
| t.Fatalf("expect not valid volume for HostConfig %+v", hostConfig) | ||
| } | ||
|
|
||
| // binds 1 volume | ||
| binds = []string{"serviceuuid:/usr/vol"} | ||
| hostConfig.Binds = binds | ||
| set, suuid = setVolumeDriver(hostConfig, cluster, taskArn, taskDef) | ||
| if !set || suuid != "serviceuuid" { | ||
| t.Fatalf("expect valid volume for HostConfig %+v, expect serviceuuid get %s", hostConfig, suuid) | ||
| } | ||
| binds = append(binds, "serviceuuid:/usr/vol1") | ||
| set, suuid = setVolumeDriver(hostConfig, cluster, taskArn, taskDef) | ||
| if !set || suuid != "serviceuuid" { | ||
| t.Fatalf("expect valid volume for HostConfig %+v, expect serviceuuid get %s", hostConfig, suuid) | ||
| } | ||
| } |