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

Speed up minions response by letting sql handle highstate lookup / sorting #440

Merged
merged 16 commits into from
Oct 20, 2023
Merged

Speed up minions response by letting sql handle highstate lookup / sorting #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
53ec34f
limit amount of highstates being looked up
ITJamie Jun 21, 2022
d8f8a5c
Update models.py
ITJamie Jun 21, 2022
e2b95d1
Update models.py
ITJamie Jun 21, 2022
eb26d7e
Update models.py
ITJamie Jun 21, 2022
d5bc299
Update models.py
ITJamie Jun 21, 2022
230d734
lower amount of jobs loaded by default on jid's
ITJamie Jun 21, 2022
ebb34f4
more tuning
ITJamie Jun 21, 2022
5ae5fed
limit amount of highstates being looked up
ITJamie Jun 21, 2022
f1dc735
Update models.py
ITJamie Jun 21, 2022
08be7b4
Update models.py
ITJamie Jun 21, 2022
dfc7124
Update models.py
ITJamie Jun 21, 2022
9c78132
Update models.py
ITJamie Jun 21, 2022
896c4a7
lower amount of jobs loaded by default on jid's
ITJamie Jun 21, 2022
0228bee
more tuning
ITJamie Jun 21, 2022
2dee4b1
Merge branch 'develop' of https://github.com/ITJamie/alcali into develop
ITJamie Jun 18, 2023
1c22533
Merge branch 'develop' into develop
mattLLVW Oct 20, 2023
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
4 changes: 2 additions & 2 deletions api/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ def last_highstate(self):
# Get all potential jobs.
states = SaltReturns.objects.filter(
Q(fun="state.apply") | Q(fun="state.highstate"), id=self.minion_id
)
states = sorted(states, key=lambda x: x.jid, reverse=True)
).order_by('-jid')[0:2]
states = sorted(states, key=lambda x: x.jid)

# Remove jobs with arguments.
for state in states:
Expand Down
8 changes: 4 additions & 4 deletions api/views/salt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def get_queryset(self):
qry = {}
start = self.request.query_params.get("start", None)
end = self.request.query_params.get("end", None)
limit = int(self.request.query_params.get("limit", 200))
limit = int(self.request.query_params.get("limit", 50))
target = self.request.query_params.getlist("target[]")
users = self.request.query_params.getlist("users[]", None)
if target:
Expand All @@ -57,8 +57,8 @@ class SaltReturnsListJid(generics.ListAPIView):

def get_queryset(self):
jid = self.kwargs["jid"]
queryset = SaltReturns.objects.all()
return queryset.filter(jid=jid).order_by("-alter_time")
queryset = SaltReturns.objects.filter(jid=jid).order_by("-alter_time")
return queryset


@api_view(["GET"])
Expand Down Expand Up @@ -97,5 +97,5 @@ class EventsViewSet(viewsets.ReadOnlyModelViewSet):
A simple ViewSet for viewing accounts.
"""

queryset = SaltEvents.objects.all().order_by("-alter_time")[:200]
queryset = SaltEvents.objects.all().order_by("-alter_time")[:50]
serializer_class = EventsSerializer
Loading