Skip to content

Commit

Permalink
Fix for bug innodbstatus not assigned
Browse files Browse the repository at this point in the history
  • Loading branch information
LauJosefsen committed Apr 11, 2024
1 parent b77af30 commit 0934f2b
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 58 deletions.
76 changes: 38 additions & 38 deletions .github/workflows/build-push-release.yml
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
on:
release:
types: [created]
release:
types: [created]

#
name: Create and publish a Docker image

# Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}

# There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu.
jobs:
build-and-push-image:
runs-on: ubuntu-latest
# Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
permissions:
contents: read
packages: write
#
steps:
- name: Checkout repository
uses: actions/checkout@v4
# Uses the `docker/login-action` action to log in to the Container registry registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here.
- name: Log in to the Container registry
uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
# This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about) to extract tags and labels that will be applied to the specified image. The `id` "meta" allows the output of this step to be referenced in a subsequent step. The `images` value provides the base name for the tags and labels.
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
# This step uses the `docker/build-push-action` action to build the image, based on your repository's `Dockerfile`. If the build succeeds, it pushes the image to GitHub Packages.
# It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see "[Usage](https://github.com/docker/build-push-action#usage)" in the README of the `docker/build-push-action` repository.
# It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step.
- name: Build and push Docker image
uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
with:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-and-push-image:
runs-on: ubuntu-latest
# Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
permissions:
contents: read
packages: write
#
steps:
- name: Checkout repository
uses: actions/checkout@v4
# Uses the `docker/login-action` action to log in to the Container registry registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here.
- name: Log in to the Container registry
uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
# This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about) to extract tags and labels that will be applied to the specified image. The `id` "meta" allows the output of this step to be referenced in a subsequent step. The `images` value provides the base name for the tags and labels.
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
# This step uses the `docker/build-push-action` action to build the image, based on your repository's `Dockerfile`. If the build succeeds, it pushes the image to GitHub Packages.
# It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see "[Usage](https://github.com/docker/build-push-action#usage)" in the README of the `docker/build-push-action` repository.
# It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step.
- name: Build and push Docker image
uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
with:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
26 changes: 16 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,27 +1,33 @@
This is a small Next.js app for viewing and killing active processes on multiple MariaDB instances.

### Features
- See all active processes, joined with any open transactions.
- Mark long-running open transactions with red.
- Sorted by transaction time desc, then by process time desc.
- Kill a process with two clicks.

- See all active processes, joined with any open transactions.
- Mark long-running open transactions with red.
- Sorted by transaction time desc, then by process time desc.
- Kill a process with two clicks.

### Deployment

Docker images: https://github.com/cego/mysql-admin/pkgs/container/mysql-admin

The image requires the following environment variables:
- `DB_INSTANCES` - A comma separated list of MariaDB instances to connect to.

- `DB_INSTANCES` - A comma separated list of MariaDB instances to connect to.

For each instance, the following environment variables are required:
- `{DB_INSTANCE_NAME}_HOST` - The hostname of the MariaDB instance.
- `{DB_INSTANCE_NAME}_PORT` - The port of the MariaDB instance.
- `{DB_INSTANCE_NAME}_USER` - The username to connect to the MariaDB instance.

- `{DB_INSTANCE_NAME}_HOST` - The hostname of the MariaDB instance.
- `{DB_INSTANCE_NAME}_PORT` - The port of the MariaDB instance.
- `{DB_INSTANCE_NAME}_USER` - The username to connect to the MariaDB instance.

And optionally
- `{DB_INSTANCE_NAME}_PASSWORD` - The password to connect to the MariaDB instance.
- `{DB_INSTANCE_NAME}_DATABASE` - The database to connect to on the MariaDB instance.

- `{DB_INSTANCE_NAME}_PASSWORD` - The password to connect to the MariaDB instance.
- `{DB_INSTANCE_NAME}_DATABASE` - The database to connect to on the MariaDB instance.

Example environment variables can be found [here](.env).

### Development

To start a dev server, run `bun start dev`
11 changes: 6 additions & 5 deletions src/pages/api/kill.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,13 @@ export default async function handler(
try {
conn = await mysql.createConnection(dbConfig)
await conn.query(`KILL ?`, [id])
if(process.env.USER_HEADER) {
const user = req.headers[process.env.USER_HEADER];
console.log(`User ${user} killed process ${id} on instance ${instance}`)
if (process.env.USER_HEADER) {
const user = req.headers[process.env.USER_HEADER]
console.log(
`User ${user} killed process ${id} on instance ${instance}`
)
}
}
finally {
} finally {
conn?.end()
}
res.status(200).json({ id })
Expand Down
14 changes: 9 additions & 5 deletions src/pages/instance/[identifier]/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,11 @@ const parseInnoDbStatus = (innoDbStatus: string): TransactionInfoDict => {

for (let i = transactionsStartIndex; i < splitInnoDbStatus.length; i++) {
const line = splitInnoDbStatus[i]

if (line === undefined) {
continue
}

if (line.startsWith('--------')) {
break
}
Expand Down Expand Up @@ -118,7 +123,7 @@ export const getServerSideProps = (async (context) => {
let conn: mysql.Connection | null = null

let processList: Process[] = []
let innoDbStatusString = '';
let innoDbStatusString = ''

try {
conn = await mysql.createConnection(instance)
Expand All @@ -128,13 +133,12 @@ export const getServerSideProps = (async (context) => {
'SHOW ENGINE INNODB STATUS;'
)

const innoDbStatusString = innoDbStatusResult[0]['Status'] as string
}
finally {
innoDbStatusString = innoDbStatusResult[0]['Status'] as string
} finally {
conn?.end()
}

const innoDbStatus = parseInnoDbStatus(innoDbStatusString);
const innoDbStatus = parseInnoDbStatus(innoDbStatusString)

const processListWithTransaction: ProcessWithTransaction[] =
processList.map((process) => {
Expand Down

0 comments on commit 0934f2b

Please sign in to comment.