Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
41f3a2ac
M
milvus
项目概览
milvus
/
milvus
10 个月 前同步成功
通知
260
Star
22476
Fork
2472
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
milvus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
41f3a2ac
编写于
8月 19, 2019
作者:
W
wxyu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
MS-379 Add Dump implementation in Resource
Former-commit-id: 0ad824b5d582fc7235a0e29919fdf5a2975bf534
上级
08a0f545
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
83 addition
and
11 deletion
+83
-11
cpp/CHANGELOG.md
cpp/CHANGELOG.md
+1
-0
cpp/src/scheduler/Scheduler.cpp
cpp/src/scheduler/Scheduler.cpp
+0
-1
cpp/src/scheduler/resource/CpuResource.cpp
cpp/src/scheduler/resource/CpuResource.cpp
+4
-0
cpp/src/scheduler/resource/CpuResource.h
cpp/src/scheduler/resource/CpuResource.h
+7
-0
cpp/src/scheduler/resource/DiskResource.cpp
cpp/src/scheduler/resource/DiskResource.cpp
+4
-0
cpp/src/scheduler/resource/DiskResource.h
cpp/src/scheduler/resource/DiskResource.h
+7
-0
cpp/src/scheduler/resource/GpuResource.cpp
cpp/src/scheduler/resource/GpuResource.cpp
+4
-0
cpp/src/scheduler/resource/GpuResource.h
cpp/src/scheduler/resource/GpuResource.h
+7
-0
cpp/src/scheduler/resource/Resource.cpp
cpp/src/scheduler/resource/Resource.cpp
+5
-0
cpp/src/scheduler/resource/Resource.h
cpp/src/scheduler/resource/Resource.h
+7
-0
cpp/unittest/scheduler/normal_test.cpp
cpp/unittest/scheduler/normal_test.cpp
+37
-10
未找到文件。
cpp/CHANGELOG.md
浏览文件 @
41f3a2ac
...
...
@@ -30,6 +30,7 @@ Please mark all change in change log and use the ticket from JIRA.
-
MS-376 - Add loader and executor enable flag in Resource avoid diskresource execute task
-
MS-377 - Improve process thread trigger in ResourceMgr, Scheduler and TaskTable
-
MS-378 - Debug and Update normal_test in scheduler unittest
-
MS-379 - Add Dump implementation in Resource
## New Feature
-
MS-343 - Implement ResourceMgr
...
...
cpp/src/scheduler/Scheduler.cpp
浏览文件 @
41f3a2ac
...
...
@@ -4,7 +4,6 @@
* Proprietary and confidential.
******************************************************************************/
#include <iostream>
#include "Scheduler.h"
#include "Cost.h"
#include "action/Action.h"
...
...
cpp/src/scheduler/resource/CpuResource.cpp
浏览文件 @
41f3a2ac
...
...
@@ -11,6 +11,10 @@ namespace zilliz {
namespace
milvus
{
namespace
engine
{
std
::
ostream
&
operator
<<
(
std
::
ostream
&
out
,
const
CpuResource
&
resource
)
{
out
<<
resource
.
Dump
();
return
out
;
}
CpuResource
::
CpuResource
(
std
::
string
name
)
:
Resource
(
std
::
move
(
name
),
ResourceType
::
CPU
)
{}
...
...
cpp/src/scheduler/resource/CpuResource.h
浏览文件 @
41f3a2ac
...
...
@@ -19,6 +19,13 @@ public:
explicit
CpuResource
(
std
::
string
name
);
inline
std
::
string
Dump
()
const
override
{
return
"<CpuResource>"
;
}
friend
std
::
ostream
&
operator
<<
(
std
::
ostream
&
out
,
const
CpuResource
&
resource
);
protected:
void
LoadFile
(
TaskPtr
task
)
override
;
...
...
cpp/src/scheduler/resource/DiskResource.cpp
浏览文件 @
41f3a2ac
...
...
@@ -10,6 +10,10 @@ namespace zilliz {
namespace
milvus
{
namespace
engine
{
std
::
ostream
&
operator
<<
(
std
::
ostream
&
out
,
const
DiskResource
&
resource
)
{
out
<<
resource
.
Dump
();
return
out
;
}
DiskResource
::
DiskResource
(
std
::
string
name
)
:
Resource
(
std
::
move
(
name
),
ResourceType
::
DISK
,
true
,
false
)
{
...
...
cpp/src/scheduler/resource/DiskResource.h
浏览文件 @
41f3a2ac
...
...
@@ -18,6 +18,13 @@ public:
explicit
DiskResource
(
std
::
string
name
);
inline
std
::
string
Dump
()
const
override
{
return
"<DiskResource>"
;
}
friend
std
::
ostream
&
operator
<<
(
std
::
ostream
&
out
,
const
DiskResource
&
resource
);
protected:
void
LoadFile
(
TaskPtr
task
)
override
;
...
...
cpp/src/scheduler/resource/GpuResource.cpp
浏览文件 @
41f3a2ac
...
...
@@ -11,6 +11,10 @@ namespace zilliz {
namespace
milvus
{
namespace
engine
{
std
::
ostream
&
operator
<<
(
std
::
ostream
&
out
,
const
GpuResource
&
resource
)
{
out
<<
resource
.
Dump
();
return
out
;
}
GpuResource
::
GpuResource
(
std
::
string
name
)
:
Resource
(
std
::
move
(
name
),
ResourceType
::
GPU
)
{}
...
...
cpp/src/scheduler/resource/GpuResource.h
浏览文件 @
41f3a2ac
...
...
@@ -18,6 +18,13 @@ public:
explicit
GpuResource
(
std
::
string
name
);
inline
std
::
string
Dump
()
const
override
{
return
"<GpuResource>"
;
}
friend
std
::
ostream
&
operator
<<
(
std
::
ostream
&
out
,
const
GpuResource
&
resource
);
protected:
void
LoadFile
(
TaskPtr
task
)
override
;
...
...
cpp/src/scheduler/resource/Resource.cpp
浏览文件 @
41f3a2ac
...
...
@@ -10,6 +10,11 @@ namespace zilliz {
namespace
milvus
{
namespace
engine
{
std
::
ostream
&
operator
<<
(
std
::
ostream
&
out
,
const
Resource
&
resource
)
{
out
<<
resource
.
Dump
();
return
out
;
}
Resource
::
Resource
(
std
::
string
name
,
ResourceType
type
,
bool
enable_loader
,
...
...
cpp/src/scheduler/resource/Resource.h
浏览文件 @
41f3a2ac
...
...
@@ -74,6 +74,13 @@ public:
TaskTable
&
task_table
();
inline
virtual
std
::
string
Dump
()
const
{
return
"<Resource>"
;
}
friend
std
::
ostream
&
operator
<<
(
std
::
ostream
&
out
,
const
Resource
&
resource
);
public:
/*
* wake up loader;
...
...
cpp/unittest/scheduler/normal_test.cpp
浏览文件 @
41f3a2ac
...
...
@@ -36,20 +36,47 @@ TEST(normal_test, test1) {
observe
->
task_table
().
Put
(
task2
);
observe
->
task_table
().
Put
(
task3
);
observe
->
task_table
().
Put
(
task4
);
std
::
cout
<<
"disk:"
<<
std
::
endl
;
std
::
cout
<<
observe
->
task_table
().
Dump
()
<<
std
::
endl
;
}
// if (auto disk_r = disk.lock()) {
// if (auto cpu_r = cpu.lock()) {
// if (auto gpu1_r = gpu1.lock()) {
// if (auto gpu2_r = gpu2.lock()) {
// std::cout << "<<<<<<<<<<before<<<<<<<<<<" << std::endl;
// std::cout << "disk:" << std::endl;
// std::cout << disk_r->task_table().Dump() << std::endl;
// std::cout << "cpu:" << std::endl;
// std::cout << cpu_r->task_table().Dump() << std::endl;
// std::cout << "gpu1:" << std::endl;
// std::cout << gpu1_r->task_table().Dump() << std::endl;
// std::cout << "gpu2:" << std::endl;
// std::cout << gpu2_r->task_table().Dump() << std::endl;
// std::cout << ">>>>>>>>>>before>>>>>>>>>>" << std::endl;
// }
// }
// }
// }
sleep
(
5
);
if
(
auto
observe
=
disk
.
lock
())
{
std
::
cout
<<
"disk:"
<<
std
::
endl
;
std
::
cout
<<
observe
->
task_table
().
Dump
()
<<
std
::
endl
;
}
if
(
auto
observe
=
cpu
.
lock
())
{
std
::
cout
<<
"cpu:"
<<
std
::
endl
;
std
::
cout
<<
observe
->
task_table
().
Dump
()
<<
std
::
endl
;
}
// if (auto disk_r = disk.lock()) {
// if (auto cpu_r = cpu.lock()) {
// if (auto gpu1_r = gpu1.lock()) {
// if (auto gpu2_r = gpu2.lock()) {
// std::cout << "<<<<<<<<<<after<<<<<<<<<<" << std::endl;
// std::cout << "disk:" << std::endl;
// std::cout << disk_r->task_table().Dump() << std::endl;
// std::cout << "cpu:" << std::endl;
// std::cout << cpu_r->task_table().Dump() << std::endl;
// std::cout << "gpu1:" << std::endl;
// std::cout << gpu1_r->task_table().Dump() << std::endl;
// std::cout << "gpu2:" << std::endl;
// std::cout << gpu2_r->task_table().Dump() << std::endl;
// std::cout << ">>>>>>>>>>after>>>>>>>>>>" << std::endl;
// }
// }
// }
// }
scheduler
->
Stop
();
res_mgr
->
Stop
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录