Skip to content

fix: ready-based immediate task indexing #1129

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

Merged
merged 6 commits into from
Feb 26, 2025
Merged

fix: ready-based immediate task indexing #1129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a0102fd
fix: ready-based immediate task indexing
Feb 26, 2025
7687689
fixup
Feb 26, 2025
51cff20
debug
Feb 26, 2025
1130511
fixup attempt
Feb 26, 2025
9b83de4
fixup
Feb 26, 2025
251d2fc
fixup
Feb 26, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions integration-tests/js-compute/setup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,16 @@ import { getEnv } from './env.js';
const serviceId = argv[2];
const serviceName = argv[3];

const env = getEnv(serviceName);
Object.assign(process.env, env);

const {
DICTIONARY_NAME,
CONFIG_STORE_NAME,
KV_STORE_NAME,
SECRET_STORE_NAME,
ACL_NAME,
} = getEnv(serviceName);
} = env;

function existingListId(stores, existingName) {
const existing = stores.find(
Expand Down Expand Up @@ -49,11 +52,10 @@ async function setupConfigStores() {
if (!STORE_ID) {
console.log(`Creating new config store ${DICTIONARY_NAME}`);
STORE_ID = JSON.parse(
await zx`fastly config-store create --quiet --name=${DICTIONARY_NAME} --json --token $FASTLY_API_TOKEN`,
await zx`fastly config-store create --quiet --name="$DICTIONARY_NAME" --json --token $FASTLY_API_TOKEN`,
).id;
} else {
console.log(`Using existing config store ${DICTIONARY_NAME}`);
STORE_ID = STORE_ID;
}
await zx`echo -n 'https://twitter.com/fastly' | fastly config-store-entry update --upsert --key twitter --store-id=${STORE_ID} --stdin --token $FASTLY_API_TOKEN`;
try {
Expand All @@ -66,11 +68,10 @@ async function setupConfigStores() {
if (!STORE_ID) {
console.log(`Creating new config store ${CONFIG_STORE_NAME}`);
STORE_ID = JSON.parse(
await zx`fastly config-store create --quiet --name=${CONFIG_STORE_NAME} --json --token $FASTLY_API_TOKEN`,
await zx`fastly config-store create --quiet --name="$CONFIG_STORE_NAME" --json --token $FASTLY_API_TOKEN`,
).id;
} else {
console.log(`Using existing config store ${CONFIG_STORE_NAME}`);
STORE_ID = STORE_ID;
}
await zx`echo -n 'https://twitter.com/fastly' | fastly config-store-entry update --upsert --key twitter --store-id=${STORE_ID} --stdin --token $FASTLY_API_TOKEN`;
try {
Expand All @@ -89,11 +90,10 @@ async function setupKVStore() {
if (!STORE_ID) {
console.log(`Creating new KV store ${KV_STORE_NAME}`);
STORE_ID = JSON.parse(
await zx`fastly kv-store create --quiet --name=${KV_STORE_NAME} --json --token $FASTLY_API_TOKEN`,
await zx`fastly kv-store create --quiet --name="$KV_STORE_NAME" --json --token $FASTLY_API_TOKEN`,
).StoreID;
} else {
console.log(`Using existing KV store ${KV_STORE_NAME}`);
STORE_ID = STORE_ID;
}
try {
await zx`fastly resource-link create --service-id ${serviceId} --version latest --resource-id ${STORE_ID} --token $FASTLY_API_TOKEN --autoclone`;
Expand All @@ -110,7 +110,7 @@ async function setupSecretStore() {
if (!STORE_ID) {
console.log(`Creating new secret store ${SECRET_STORE_NAME}`);
STORE_ID = JSON.parse(
await zx`fastly secret-store create --quiet --name=${SECRET_STORE_NAME} --json --token $FASTLY_API_TOKEN`,
await zx`fastly secret-store create --quiet --name="$SECRET_STORE_NAME" --json --token $FASTLY_API_TOKEN`,
).id;
} else {
console.log(`Using existing secret store ${SECRET_STORE_NAME}`);
Expand All @@ -136,7 +136,7 @@ async function setupAcl() {
if (!ACL_ID) {
console.log(`Creating ACL ${ACL_NAME}`);
ACL_ID = JSON.parse(
await zx`fastly compute acl create --name=${ACL_NAME} --token $FASTLY_API_TOKEN --json`,
await zx`fastly compute acl create --name="$ACL_NAME" --token $FASTLY_API_TOKEN --json`,
).id;
await zx`fastly compute acl update --acl-id=${ACL_ID} --operation=create --prefix=100.100.0.0/16 --action=BLOCK --token $FASTLY_API_TOKEN`;
await zx`fastly compute acl update --acl-id=${ACL_ID} --operation=create --prefix=2a03:4b80::/32 --action=ALLOW --token $FASTLY_API_TOKEN`;
Expand All @@ -150,9 +150,11 @@ async function setupAcl() {
}
}

zx.verbose = true;
await setupConfigStores();
await setupKVStore();
await setupSecretStore();
await setupAcl();
zx.verbose = false;

await zx`fastly service-version activate --service-id ${serviceId} --version latest --token $FASTLY_API_TOKEN`;
3 changes: 2 additions & 1 deletion runtime/fastly/host-api/host_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@ size_t api::AsyncTask::select(std::vector<api::AsyncTask *> &tasks) {
// only immediate timers in the task list -> do a ready check against all handles instead of a
// select
if (now != 0 && soonest_deadline == now) {
for (auto handle : handles) {
for (ret = 0; ret < handles.size(); ++ret) {
auto handle = handles.at(ret);
uint32_t is_ready_out;
if (!convert_result(fastly::async_is_ready(handle, &is_ready_out), &err)) {
if (host_api::error_is_bad_handle(err)) {
Expand Down
Loading