wassname/ray
1
0
Fork 0
mirror of https://github.com/wassname/ray.git synced 2026-07-24 13:20:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix streaming ci (#8159)

Browse Source
This commit is contained in:
chaokunyang
2020-04-26 20:56:58 +08:00
committed by GitHub
parent 5bff707d20
commit 5cf49d5edd
18 changed files with 68 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
streaming/src/config/streaming_config.cc
-4
View File
@@ -18,10 +18,6 @@ void StreamingConfig::FromProto(const uint8_t *data, uint32_t size) {
if (!config.job_name().empty()) {
SetJobName(config.job_name());
}
if (!config.task_job_id().empty()) {
STREAMING_CHECK(config.task_job_id().size() == 2 * JobID::Size());
SetTaskJobId(config.task_job_id());
}
if (!config.worker_name().empty()) {
SetWorkerName(config.worker_name());
}
streaming/src/config/streaming_config.h
-3
View File
@@ -30,8 +30,6 @@ class StreamingConfig {
std::string worker_name_ = "DEFAULT_WORKER_NAME";
std::string task_job_id_ = JobID::Nil().Hex();
// Default flow control type is unconsumed sequence flow control. More detail
// introducation and implemention in ray/streaming/src/flow_control.h.
streaming::proto::FlowControlType flow_control_type_ =
@@ -50,7 +48,6 @@ class StreamingConfig {
TYPE Get##NAME() const { return VALUE; } \
void Set##NAME(TYPE value) { VALUE = value; }
DECL_GET_SET_PROPERTY(const std::string &, TaskJobId, task_job_id_)
DECL_GET_SET_PROPERTY(const std::string &, WorkerName, worker_name_)
DECL_GET_SET_PROPERTY(const std::string &, OpName, op_name_)
DECL_GET_SET_PROPERTY(uint32_t, EmptyMessageTimeInterval, empty_message_time_interval_)
streaming/src/data_writer.cc
+1 -6
View File
@@ -134,12 +134,7 @@ StreamingStatus DataWriter::Init(const std::vector<ObjectID> &queue_id_vec,
const std::vector<uint64_t> &channel_message_id_vec,
const std::vector<uint64_t> &queue_size_vec) {
STREAMING_CHECK(!queue_id_vec.empty() && !channel_message_id_vec.empty());
ray::JobID job_id =
JobID::FromBinary(Util::Hexqid2str(runtime_context_->GetConfig().GetTaskJobId()));
STREAMING_LOG(INFO) << "Job name => " << runtime_context_->GetConfig().GetJobName()
<< ", job id => " << job_id;
STREAMING_LOG(INFO) << "Job name => " << runtime_context_->GetConfig().GetJobName();
output_queue_ids_ = queue_id_vec;
transfer_config_->Set(ConfigEnum::QUEUE_ID_VECTOR, queue_id_vec);
streaming/src/protobuf/streaming.proto
-1
View File
@@ -29,7 +29,6 @@ enum FlowControlType {
// all string in this message is ASCII string
message StreamingConfig {
string job_name = 1;
string task_job_id = 2;
string worker_name = 3;
string op_name = 4;
NodeType role = 5;