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

Jump to bottom

feat(FR-360): add max_pending_session_count, max_concurrent_sftp_sessions to keypair resource policy. #3025

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(FR-360): add max_pending_session_count, max_concurrent_sftp_sessions to keypair resource policy. #3025

wants to merge 1 commit into from

Conversation

agatha197
Copy link
Contributor

@agatha197 agatha197 commented Jan 14, 2025 •
edited
Loading

resolves #3017
related PR: https://lablup.atlassian.net/browse/FR-317
refer: lablup/backend.ai#3413

Added support for two new resource policy fields in keypair resource policy:

  • max_pending_session_count: Controls maximum number of sessions that can be in pending state
  • max_concurrent_sftp_sessions: Controls maximum number of concurrent SFTP sessions

Checklist:

  • Minimum required manager version: v24.03.4
  • Test cases:
    • Create/modify keypair resource policy with new fields
    • Verify unlimited values work correctly (null for pending sessions, 0 for SFTP sessions)
    • Check fields are hidden when manager version < 24.03.4
    • Verify CSV export includes new fields
    • Test form validation and limits (0 to 2^31-1)

The PR also includes:

  • Improved form layout and styling in resource policy modal
  • Updated translations for new fields across all languages
  • Refactored unlimited value handling in FormItemWithUnlimited component

Screenshots:
image
image

@github-actions github-actions bot added area:lib Library and SDK related issue. area:ux UI / UX issue. area:i18n Localization labels Jan 14, 2025
@github-actions github-actions bot added the size:L 100~500 LoC label Jan 14, 2025
@agatha197 Graphite App
Copy link
Contributor Author

agatha197 commented Jan 14, 2025 •
edited
Loading

How to use the Graphite Merge Queue

Add either label to this PR to merge it via the merge queue:

  • flow:merge-queue - adds this PR to the back of the merge queue
  • flow:hotfix - for urgent hot fixes, skip the queue and merge this PR next

You must have a Graphite account in order to use the merge queue. Sign up using this link.

An organization admin has required the Graphite Merge Queue in this repository.

Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue.

This stack of pull requests is managed by Graphite. Learn more about stacking.

@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 14, 2025 •
edited
Loading

Coverage report for ./react

St.❔
 Category Percentage Covered / Total
🔴 Statements
4.95% (-0.01% 🔻)
 398/8043
🔴 Branches
4.26% (-0.02% 🔻)
 237/5565
🔴 Functions
2.96% (-0.01% 🔻)
 78/2631
🔴 Lines
4.87% (-0.01% 🔻)
 383/7869

Test suite run success

124 tests passing in 14 suites.

Report generated by 🧪jest coverage report action from b8ee0c8

@agatha197 agatha197 added this to the 24.12 milestone Jan 14, 2025
@agatha197 agatha197 force-pushed the feature/support-new-2403-fields-to-keypair-resource-policy branch 2 times, most recently from 73e6232 to 27be261 Compare January 14, 2025 07:19
@agatha197 agatha197 force-pushed the feature/support-new-2403-fields-to-keypair-resource-policy branch from 27be261 to b8ee0c8 Compare January 14, 2025 10:44
@agatha197 agatha197 mentioned this pull request Jan 14, 2025
Open
3 tasks
ironAiken2
ironAiken2 requested changes Jan 24, 2025
View reviewed changes
src/lib/backend.ai-client-esm.ts
@@ -702,6 +702,8 @@ class Client {
}
if (this.isManagerVersionCompatibleWith('24.03.4')) {
this._features['endpoint-extra-mounts'] = true;
this._features['max-pending-session-count'] = true;
this._features['max-concurrent-sftp-sessions'] = true;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the schema, it says that the max_concurrent_sftp_sessions field was added as of 23.03.3. Please check :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above. please refer lablup/backend.ai#3413

react/src/components/FormItemWithUnlimited.tsx
@@ -30,19 +27,19 @@ const FormItemWithUnlimited: React.FC<FormItemWithUnlimitedProps> = ({
}, [form, name, unlimitedValue]);

// Disable children when isUnlimited is true.
const childrenWithProps = isValidElement(children)
const childrenWithProps = React.isValidElement(children)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason for this change?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no. it is okay to revert it.

react/src/components/KeypairResourcePolicyList.tsx
@@ -82,6 +81,8 @@ const KeypairResourcePolicyList: React.FC<KeypairResourcePolicyListProps> = (
max_containers_per_session
idle_timeout
allowed_vfolder_hosts
max_pending_session_count @since(version: "24.03.4")
max_concurrent_sftp_sessions @since(version: "24.03.4")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also looks to be 23.03.3 in the schema.

backend.ai-webui/react/data/schema.graphql

Lines 980 to 988 in a48214d

"""Added in 23.03.3."""
max_concurrent_sftp_sessions: Int
"""Added in 24.03.4."""
max_pending_session_count: Int
"""Added in 24.03.4."""
max_pending_session_resource_slots: JSONString
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please refer lablup/backend.ai#3413

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll leave comment. It occurs error when testing in 23.03.3

react/src/components/KeypairResourcePolicySettingModal.tsx
Comment on lines +39 to +50
const useStyles = createStyles(({ css }) => ({
label: css`
.ant-form-item
.ant-form-item-label
> label.ant-form-item-required:not(
.ant-form-item-required-mark-optional
)::before {
display: none;
}
`,
}));

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need to use createStyles. Just set requiredMark={false}

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ironAiken2 ironAiken2 ironAiken2 requested changes

@yomybaby yomybaby Awaiting requested review from yomybaby

Requested changes must be addressed to merge this pull request.

Assignees

@agatha197 agatha197

Labels
area:i18n Localization area:lib Library and SDK related issue. area:ux UI / UX issue. size:L 100~500 LoC
Projects
None yet
Milestone
24.12
Development

Successfully merging this pull request may close these issues.

Let's add max_pending_session_count, max_concurrent_sftp_sessions to keypair resource policy.
2 participants
@agatha197 @ironAiken2