Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(server): prevent allocating to unregistered executors #1133

Closed
wants to merge 1 commit into from
Closed

feat(server): prevent allocating to unregistered executors #1133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion server/data_model/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ impl ExecutorId {
pub fn get(&self) -> &str {
&self.0
}

pub fn executor_key(&self) -> String {
self.0.to_string()
}
}

#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord, Hash)]
Expand Down Expand Up @@ -911,7 +915,7 @@ pub struct ExecutorMetadata {

impl ExecutorMetadata {
pub fn key(&self) -> String {
format!("{}", self.id)
self.id.executor_key()
}
}

Expand Down
12 changes: 10 additions & 2 deletions server/state_store/src/state_machine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,6 @@ pub(crate) fn delete_input_data_object(
Ok(())
}

// TODO: Do this in a transaction.
pub(crate) fn create_or_update_compute_graph(
db: Arc<TransactionDB>,
txn: &Transaction<TransactionDB>,
Expand Down Expand Up @@ -735,7 +734,16 @@ pub fn allocate_tasks(
executor_id: &ExecutorId,
sm_metrics: Arc<StateStoreMetrics>,
) -> Result<()> {
// TODO: check if executor is registered
if txn
.get_for_update_cf(
&IndexifyObjectsColumns::Executors.cf_db(&db),
executor_id.executor_key(),
false,
)?
.is_none()
{
return Err(anyhow!("executor not found: {}", executor_id));
}
txn.put_cf(
&IndexifyObjectsColumns::TaskAllocations.cf_db(&db),
task.make_allocation_key(executor_id),
Expand Down
Loading