marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added Queue size to Environments to understand size of queue currently

Browse Source
This commit is contained in:
Frikky
2023-11-16 18:22:53 +01:00
parent 91a96a40c2
commit caaf4a5a40
3 changed files with 58 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/go-app/go.mod
+2 -2
View File
@@ -1,6 +1,6 @@
module shuffle-shared module shuffle-shared
//replace github.com/shuffle/shuffle-shared => ../../../shuffle-shared replace github.com/shuffle/shuffle-shared => ../../../shuffle-shared
go 1.19 go 1.19
@@ -19,7 +19,7 @@ require (
github.com/h2non/filetype v1.1.3 github.com/h2non/filetype v1.1.3
github.com/satori/go.uuid v1.2.0 github.com/satori/go.uuid v1.2.0
github.com/shuffle/shuffle-shared v0.4.79 github.com/shuffle/shuffle-shared v0.4.79
golang.org/x/crypto v0.9.0 golang.org/x/crypto v0.14.0
google.golang.org/api v0.125.0 google.golang.org/api v0.125.0
google.golang.org/grpc v1.55.0 google.golang.org/grpc v1.55.0
gopkg.in/src-d/go-git.v4 v4.13.1 gopkg.in/src-d/go-git.v4 v4.13.1
docker-compose.yml
+3 -3
View File
@@ -1,7 +1,7 @@
version: '3' version: '3'
services: services:
frontend: frontend:
image: ghcr.io/shuffle/shuffle-frontend:latest image: ghcr.io/shuffle/shuffle-frontend:nightly
container_name: shuffle-frontend container_name: shuffle-frontend
hostname: shuffle-frontend hostname: shuffle-frontend
ports: ports:
@@ -15,7 +15,7 @@ services:
depends_on: depends_on:
- backend - backend
backend: backend:
image: ghcr.io/shuffle/shuffle-backend:latest image: ghcr.io/shuffle/shuffle-backend:nightly
container_name: shuffle-backend container_name: shuffle-backend
hostname: ${BACKEND_HOSTNAME} hostname: ${BACKEND_HOSTNAME}
# Here for debugging: # Here for debugging:
@@ -34,7 +34,7 @@ services:
- SHUFFLE_FILE_LOCATION=/shuffle-files - SHUFFLE_FILE_LOCATION=/shuffle-files
restart: unless-stopped restart: unless-stopped
orborus: orborus:
image: ghcr.io/shuffle/shuffle-orborus:latest image: ghcr.io/shuffle/shuffle-orborus:nightly
container_name: shuffle-orborus container_name: shuffle-orborus
hostname: shuffle-orborus hostname: shuffle-orborus
networks: networks:
frontend/src/views/Admin.jsx
+53 -50
View File
@@ -3941,7 +3941,7 @@ If you're interested, please let me know a time that works for you, or set up a
style={{ minWidth: 125, maxWidth: 125 }} style={{ minWidth: 125, maxWidth: 125 }}
/> />
<ListItemText <ListItemText
primary="Disabled" primary={isCloud ? "Disabled" : "In Queue"}
style={{ minWidth: 100, maxWidth: 100 }} style={{ minWidth: 100, maxWidth: 100 }}
/> />
<ListItemText <ListItemText
@@ -3982,6 +3982,8 @@ If you're interested, please let me know a time that works for you, or set up a
console.log("Show CPU alert: ", showCPUAlert) console.log("Show CPU alert: ", showCPUAlert)
const queueSize = isCloud ? -1 : environment.queue !== undefined && environment.queue !== null ? environment.queue < 0 ? 0 : environment.queue > 100 ? ">100" : environment.queue : 0
return ( return (
<span key={index}> <span key={index}>
<ListItem key={index} style={{ backgroundColor: bgColor }}> <ListItem key={index} style={{ backgroundColor: bgColor }}>
@@ -4091,7 +4093,8 @@ If you're interested, please let me know a time that works for you, or set up a
overflow: "hidden", overflow: "hidden",
marginLeft: 10, marginLeft: 10,
}} }}
primary={environment.archived.toString()}
primary={isCloud ? environment.archived.toString() : queueSize}
/> />
<ListItemText <ListItemText
style={{ style={{
@@ -4116,59 +4119,59 @@ If you're interested, please let me know a time that works for you, or set up a
}} }}
> >
<div style={{ display: "flex" }}> <div style={{ display: "flex" }}>
<ButtonGroup style={{borderRadius: "5px 5px 5px 5px",}}> <ButtonGroup style={{borderRadius: "5px 5px 5px 5px",}}>
<Button <Button
variant={environment.archived ? "contained" : "outlined"} variant={environment.archived ? "contained" : "outlined"}
style={{ }} style={{ }}
onClick={() => deleteEnvironment(environment)} onClick={() => deleteEnvironment(environment)}
color="primary" color="primary"
> >
{environment.archived ? "Activate" : "Disable"} {environment.archived ? "Activate" : "Disable"}
</Button> </Button>
<Button <Button
variant={"outlined"} variant={"outlined"}
style={{ }} style={{ }}
disabled={isCloud && environment.Name.toLowerCase() !== "cloud"} disabled={isCloud && environment.Name.toLowerCase() !== "cloud"}
onClick={() => { onClick={() => {
console.log("Should clear executions for: ", environment); console.log("Should clear executions for: ", environment);
if (isCloud && environment.Name.toLowerCase() === "cloud") { if (isCloud && environment.Name.toLowerCase() === "cloud") {
rerunCloudWorkflows(environment); rerunCloudWorkflows(environment);
} else { } else {
abortEnvironmentWorkflows(environment); abortEnvironmentWorkflows(environment);
} }
}} }}
color="primary" color="primary"
> >
{isCloud && environment.Name.toLowerCase() === "cloud" ? "Rerun" : "Clear"} {isCloud && environment.Name.toLowerCase() === "cloud" ? "Rerun" : "Clear"}
</Button> </Button>
</ButtonGroup> </ButtonGroup>
</div> </div>
</ListItemText> </ListItemText>
</ListItem> </ListItem>
{showCPUAlert === false ? null : {showCPUAlert === false ? null :
<ListItem key={index+"_cpu"} style={{ backgroundColor: bgColor }}> <ListItem key={index+"_cpu"} style={{ backgroundColor: bgColor }}>
<div style={{border: "1px solid #f85a3e", borderRadius: theme.palette.borderRadius, marginTop: 10, marginBottom: 10, padding: 15, textAlign: "center", height: 70, textAlign: "left", backgroundColor: theme.palette.surfaceColor, display: "flex", }}> <div style={{border: "1px solid #f85a3e", borderRadius: theme.palette.borderRadius, marginTop: 10, marginBottom: 10, padding: 15, textAlign: "center", height: 70, textAlign: "left", backgroundColor: theme.palette.surfaceColor, display: "flex", }}>
<div style={{flex: 2, overflow: "hidden",}}> <div style={{flex: 2, overflow: "hidden",}}>
<Typography variant="body1" > <Typography variant="body1" >
90% CPU the server(s) hosting the Shuffle App Runner (Orborus) was found. 90% CPU the server(s) hosting the Shuffle App Runner (Orborus) was found.
</Typography> </Typography>
<Typography variant="body2" color="textSecondary"> <Typography variant="body2" color="textSecondary">
Need help with High Availability and Scale? <a href="/docs/configuration#scale" target="_blank" rel="noopener noreferrer" style={{ textDecoration: "none", color: "#f85a3e" }}>Read documentation</a> and <a href="https://shuffler.io/contact" target="_blank" rel="noopener noreferrer" style={{ textDecoration: "none", color: "#f85a3e" }}>Get in touch</a>. Need help with High Availability and Scale? <a href="/docs/configuration#scale" target="_blank" rel="noopener noreferrer" style={{ textDecoration: "none", color: "#f85a3e" }}>Read documentation</a> and <a href="https://shuffler.io/contact" target="_blank" rel="noopener noreferrer" style={{ textDecoration: "none", color: "#f85a3e" }}>Get in touch</a>.
</Typography> </Typography>
</div> </div>
<div style={{flex: 1, display: "flex", marginLeft: 30, }}> <div style={{flex: 1, display: "flex", marginLeft: 30, }}>
<Button style={{borderRadius: 25, width: 200, height: 50, marginTop: 8, }} variant="outlined" color="secondary" onClick={() => { <Button style={{borderRadius: 25, width: 200, height: 50, marginTop: 8, }} variant="outlined" color="secondary" onClick={() => {
// dismiss -> get envs // dismiss -> get envs
changeRecommendation(userdata.priorities[foundIndex], "dismiss") changeRecommendation(userdata.priorities[foundIndex], "dismiss")
}}> }}>
Dismiss Dismiss
</Button> </Button>
</div> </div>
</div> </div>
</ListItem> </ListItem>
} }
</span> </span>
); );
})} })}
</List> </List>