Private/edvint/tar

.git-blame-ignore-revs

@@ -28,6 +28,7 @@ b020cf35a1f2c274f95a4118d4596043cba6113f
 637d2b703e867bfdb018f228902f18ba26ff20bf
 ff39018fd6d91985f9c893a56928771dfe9fa48d
 cbb9edb17dfd122c591beb14d1275acc39492335
+d6ab15362548b8fe270bd14d5153b8d94e1b15c0
 
 # ocp-indent
 d018d26d6acd4707a23288b327b49e44f732725e

.github/workflows/main.yml

@@ -42,15 +42,6 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-        # The checkout action performs a shallow, this triggers dune to set the
-        # version to <hash>-dirty. Work around this dune behaviour and tag the
-        # commit so a proper version is always picked up
-      - name: Tag current commit
-        run: |
-          git config user.name "Dune workaround"
-          git config user.email "<>"
-          git tag -am "workaround for dune" "$XAPI_VERSION"
-
       - name: Pull configuration from xs-opam
         run: |
           curl --fail --silent https://raw.githubusercontent.com/xapi-project/xs-opam/master/tools/xs-opam-ci.env | cut -f2 -d " " > .env
@@ -95,6 +86,11 @@ jobs:
           wget -O /opt/xensource/sm/XE_SR_ERRORCODES.xml https://raw.githubusercontent.com/xapi-project/sm/master/drivers/XE_SR_ERRORCODES.xml
           opam exec -- make sdk
 
+      - name: Make install smoketest
+        run: |
+          opam exec -- make install DESTDIR=$(mktemp -d)
+          opam exec -- make install DESTDIR=$(mktemp -d) BUILD_PY2=NO
+
       - name: Uninstall unversioned packages and remove pins
         # This should purge them from the cache, unversioned package have
         # 'master' as its version

.github/workflows/release.yml

@@ -6,10 +6,8 @@ on:
       - 'v*'
 
 jobs:
-  build:
+  build-python:
     runs-on: ubuntu-latest
-    env:
-      XAPI_VERSION: ${{ github.ref_name }}
 
     steps:
       - name: Checkout code
@@ -27,7 +25,7 @@ jobs:
 
       - name: Generate python package for XenAPI
         run: |
-          ./configure --xapi-version=${{ github.ref_name }}
+          ./configure --xapi_version=${{ github.ref_name }}
           make python
 
       - name: Store python distribution artifacts
@@ -39,28 +37,20 @@ jobs:
 
   release:
     runs-on: ubuntu-latest
-    needs: build
+    needs: build-python
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
       - name: Retrieve python distribution artifacts
         uses: actions/download-artifact@v3
         with:
           name: XenAPI
           path: dist/
 
-      - name: Draft Release ${{ github.ref_name }}
-        run: gh release create ${{ github.ref_name }} --draft --generate-notes
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Upload artifacts
-        run: gh release upload ${{ github.ref_name }} dist/*
+      - name: Create release ${{ github.ref_name }}
+        run: gh release create ${{ github.ref_name }} --repo ${{ github.repository }} --generate-notes dist/*
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  publish:
+  publish-pypi:
     runs-on: ubuntu-latest
     needs: release
     environment: pypi

Makefile

@@ -181,7 +181,8 @@ install: build doc sdk doc-json
 	install -D ./ocaml/xenopsd/scripts/tap $(DESTDIR)/$(XENOPSD_LIBEXECDIR)/tap
 	install -D ./ocaml/xenopsd/scripts/qemu-vif-script $(DESTDIR)/$(XENOPSD_LIBEXECDIR)/qemu-vif-script
 	install -D ./ocaml/xenopsd/scripts/setup-vif-rules $(DESTDIR)/$(XENOPSD_LIBEXECDIR)/setup-vif-rules
-	install -D ./ocaml/xenopsd/scripts/setup-pvs-proxy-rules $(DESTDIR)/$(XENOPSD_LIBEXECDIR)/setup-pvs-proxy-rules
+	install -D ./_build/install/default/bin/pvs-proxy-ovs-setup $(DESTDIR)/$(XENOPSD_LIBEXECDIR)/pvs-proxy-ovs-setup
+	(cd $(DESTDIR)/$(XENOPSD_LIBEXECDIR) && ln -s pvs-proxy-ovs-setup setup-pvs-proxy-rules)
 	install -D ./ocaml/xenopsd/scripts/common.py $(DESTDIR)/$(XENOPSD_LIBEXECDIR)/common.py
 	install -D ./ocaml/xenopsd/scripts/igmp_query_injector.py $(DESTDIR)/$(XENOPSD_LIBEXECDIR)/igmp_query_injector.py
 	install -D ./ocaml/xenopsd/scripts/qemu-wrapper $(DESTDIR)/$(QEMU_WRAPPER_DIR)/qemu-wrapper

doc/content/squeezed/_index.md

@@ -0,0 +1,17 @@
++++
+title = "Squeezed"
+weight = 50
++++
+
+Squeezed is the XAPI Toolstack's host memory manager (aka balloon driver).
+Squeezed uses ballooning to move memory between running VMs, to avoid wasting
+host memory.
+
+Principles
+----------
+
+1. Avoid wasting host memory: unused memory should be put to use by returning
+   it to VMs.
+2. Memory should be shared in proportion to the configured policy.
+3. Operate entirely at the level of domains (not VMs), and be independent of
+   Xen toolstack.

doc/content/squeezed/architecture/index.md

@@ -0,0 +1,42 @@
++++
+title = "Architecture"
++++
+
+Squeezed is responsible for managing the memory on a single host. Squeezed
+"balances" memory between VMs according to a policy written to Xenstore.
+
+The following diagram shows the internals of Squeezed:
+
+![Internals of squeezed](squeezed.png)
+
+At the center of squeezed is an abstract model of a Xen host. The model
+includes:
+
+- The amount of already-used host memory (used by fixed overheads such as Xen
+  and the crash kernel).
+- Per-domain memory policy specifically `dynamic-min` and `dynamic-max` which
+  together describe a range, within which the domain's actual used memory
+  should remain.
+- Per-domain calibration data which allows us to compute the necessary balloon
+  target value to achive a particular memory usage value.
+
+Squeezed is a single-threaded program which receives commands from xenopsd over
+a Unix domain socket. When Xenopsd wishes to start a new VM, squeezed will be
+asked to create a "reservation". Note this is different to the Xen notion of a
+reservation. A squeezed reservation consists of an amount of memory squeezed
+will guarantee to keep free labelled with an id. When Xenopsd later creates the
+domain to notionally use the reservation, the reservation is "transferred" to
+the domain before the domain is built.
+
+Squeezed will also wake up every 30s and attempt to rebalance the memory on a
+host. This is useful to correct imbalances caused by balloon drivers
+temporarily failing to reach their targets. Note that ballooning is
+fundamentally a co-operative process, so squeezed must handle cases where the
+domains refuse to obey commands.
+
+The "output" of squeezed is a list of "actions" which include:
+
+- Set domain x's `memory/target` to a new value.
+- Set the `maxmem` of a domain to a new value (as a hard limit beyond which the
+  domain cannot allocate).
+