Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions vermeer/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,7 @@ node_modules/
/output/
/bin/*
!/bin/*.sh

# 其他 #
######################
test/case/
22 changes: 22 additions & 0 deletions vermeer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,28 @@
## Introduction
Vermeer is a high-performance distributed graph computing platform based on memory, supporting more than 15 graph algorithms, custom algorithm extensions, and custom data source access.

## Run with Docker

Pull the image:
```
docker pull hugegraph/vermeer:latest
```

Create local configuration files, for example, `~/master.ini` and `~/worker.ini`.

Run with Docker. The `--env` flag specifies the file name.

```
master: docker run -v ~/:/go/bin/config hugegraph/vermeer --env=master
worker: docker run -v ~/:/go/bin/config hugegraph/vermeer --env=worker
```

We've also provided a `docker-compose` file. Once you've created `~/master.ini` and `~/worker.ini`, and updated the `master_peer` in `worker.ini` to `172.20.0.10:6689`, you can run it using the following command:

```
docker-compose up -d
```

## Start

```
Expand Down
20 changes: 20 additions & 0 deletions vermeer/README.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,26 @@
## 简介
Vermeer是一个基于内存的高性能分布式图计算平台,支持15+图算法。支持自定义算法扩展,支持自定义数据源接入。

## 基于 Docker 运行

拉取镜像
```
docker pull hugegraph/vermeer:latest
```

创建好本地配置文件,例如`~/master.ini`与`~/worker.ini`

基于docker运行,其中`--env`指定的是文件名称。
```
master: docker run -v ~/:/go/bin/config hugegraph/vermeer --env=master
worker: docker run -v ~/:/go/bin/config hugegraph/vermeer --env=worker
```

我们也提供了`docker-compose`文件,当创建好`~/master.ini`与`~/worker.ini`,将`worker.ini`中的`master_peer`修改为`172.20.0.10:6689`后,即可通过以下命令运行:
```
docker-compose up -d
```

## 运行

```
Expand Down
1 change: 1 addition & 0 deletions vermeer/apps/graphio/local_file.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ func (a *LocalMaker) MakeTasks(params map[string]string, taskID int32) ([]LoadPa
logrus.Errorf(s)
return nil, errors.New(s)
}
logrus.Debugf("MakeTask LoadTypeLocal parse file: %s, s:%d, e:%d", files, s, e)
for i := s; i <= e; i++ {
part := LoadPartition{}
part.Init(partID, taskID, LoadPartTypeVertex)
Expand Down
2 changes: 2 additions & 0 deletions vermeer/apps/master/bl/compute_task.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ func (ctb *ComputeTaskBl) ComputeTaskStatus(
}
}
taskMgr.ForceState(computeTask.Task, structure.TaskStateComplete)
// for scheduler, mark task complete
Scheduler.taskManager.MarkTaskComplete(taskId)
graph.SubUsingNum()
computeTask.FreeMemory()
needQuery := options.GetInt(computeTask.Task.Params, "output.need_query") == 1
Expand Down
6 changes: 6 additions & 0 deletions vermeer/apps/master/bl/grpc_handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"time"
"vermeer/apps/compute"
"vermeer/apps/graphio"
"vermeer/apps/master/schedules"
"vermeer/apps/master/threshold"
"vermeer/apps/master/workers"
pb "vermeer/apps/protos"
Expand Down Expand Up @@ -103,6 +104,11 @@ func (h *ServerHandler) SayHelloMaster(ctx context.Context, req *pb.HelloMasterR
logrus.Errorf("failed to add a WorkerClient to the WorkerManager, error: %s", err)
return &pb.HelloMasterResp{}, err
}
_, err = Scheduler.ChangeWorkerStatus(reqWorker.Name, schedules.WorkerOngoingStatusIdle)
if err != nil {
logrus.Errorf("failed to change worker status to idle, error: %s", err)
return &pb.HelloMasterResp{}, err
}

logrus.Infof("worker say hello name: %s and set to workgroup: %s, client: %s", reqWorker.Name, reqWorker.Group, p.Addr.String())

Expand Down
3 changes: 3 additions & 0 deletions vermeer/apps/master/bl/load_task.go
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,9 @@ func (lb *LoadTaskBl) LoadTaskStatus(taskId int32, state string, workerName stri
loadTask.Task.SetState(structure.TaskStateLoaded)
//TaskMgr.ForceState(loadTask.Task, structure.TaskStateLoaded)

// for scheduler, mark task complete
Scheduler.taskManager.MarkTaskComplete(taskId)

logrus.Infof("graph: %s, vertex: %d, edge: %d", graph.Name, graph.VertexCount, graph.EdgeCount)
for _, w := range graph.Workers {
logrus.Infof(
Expand Down
Loading
Loading