Skip to content

Commit

Permalink
Merge pull request #7 from simonjbeaumont/internalise-more-things
Browse files Browse the repository at this point in the history
Import remaining images and fix up links to internal pages
  • Loading branch information
djs55 committed Dec 2, 2014
2 parents 37450a7 + 5b9f75c commit fcfa86a
Show file tree
Hide file tree
Showing 32 changed files with 1,937 additions and 45 deletions.
10 changes: 5 additions & 5 deletions _data/navbar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
- getting-started/designs.md
- title: High-level Features
docs:
- features/DR.md
- features/HA.md
- features/XSM.md
- features/RPU.md
- features/DR/DR.md
- features/HA/HA.md
- features/XSM/XSM.md
- features/RPU/RPU.md
- features/backtraces.md
- title: Xapi
docs:
Expand Down Expand Up @@ -39,4 +39,4 @@
- squeezed/design/design.md
- title: Future designs
docs:
- xapi/futures/distributed-database.md
- xapi/futures/database/distributed-database.md
4 changes: 2 additions & 2 deletions features/DR.md → features/DR/DR.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ title: Disaster Recovery
layout: default
---

The [HA](HA.md) feature will restart VMs after hosts have failed, but what
The [HA](../HA/HA.html) feature will restart VMs after hosts have failed, but what
happens if a whole site (e.g. datacenter) is lost? A disaster recovery
configuration is shown in the following diagram:

![Disaster recovery maintaining a secondary site](http://xapi-project.github.io/xapi-project/doc/features/dr.png)
![Disaster recovery maintaining a secondary site](dr.png)

We rely on the storage array's built-in mirroring to replicate (synchronously
or asynchronously: the admin's choice) between the primary and the secondary
Expand Down
Binary file added features/DR/dr.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
2 changes: 1 addition & 1 deletion features/HA.md → features/HA/HA.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Example
The following diagram shows an HA-enabled pool, before and after a network
link between two hosts fails.

![High-Availability in action](http://xapi-project.github.io/xapi-project/doc/features/ha.png)
![High-Availability in action](ha.png)

When HA is enabled, all hosts in the pool
- exchange periodic heartbeat messages over the network
Expand Down
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
Binary file added features/HA/ha.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion features/RPU.md → features/RPU/RPU.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ downtime. An upgrade is a sequence of operations:

The following diagram shows an upgrade of a 4 host pool:

![Installing a new version without incurring VM downtime](http://xapi-project.github.io/xapi-project/doc/features/rpu.png)
![Installing a new version without incurring VM downtime](rpu.png)

The xapi master host must be upgraded first. A new xapi version can always
talk to an old xapi, but an old xapi may not be able to talk to a a new one.
Expand Down
Binary file added features/RPU/rpu.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion features/XSM.md → features/XSM/XSM.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ The Xapi Storage Migration (XSM) also known as "Storage Motion" allows

The following diagram shows how XSM works at a high level:

![Xapi Storage Migration](http://xapi-project.github.io/xapi-project/doc/features/xsm.png)
![Xapi Storage Migration](xsm.png)

The slowest part of a storage migration is migrating the storage, since virtual
disks can be very large. Xapi starts by taking a snapshot and copying that to
Expand Down
Binary file added features/XSM/xsm.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion xapi/architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Note that Xapi delegates core functions such as

The following diagram shows the internals of Xapi:

![Internals of xapi](http://xapi-project.github.io/xen-api/doc/architecture/xapi.png)
![Internals of xapi](xapi.png)

The top of the diagram shows the XenAPI clients: XenCenter, XenOrchestra, OpenStack and
CloudStack using XenAPI and HTTP GET/PUT over ports 80 and 443 to talk to xapi.
Expand Down
2 changes: 1 addition & 1 deletion xapi/design/XenAPI-evolution.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ used by xapi. The XenAPI has *objects* which each have *fields* and

## XenAPI Lifecycle

![API lifecycle states](http://xapi-project.github.io/xen-api/doc/design/XenAPI-lifecycle.svg)
![API lifecycle states](XenAPI-lifecycle.svg)

Each element of the XenAPI (objects, messages and fields) follows the lifecycle
diagram above (inspired by
Expand Down
57 changes: 57 additions & 0 deletions xapi/design/XenAPI-lifecycle.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions xapi/design/memory-accounting.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ The inputs to the model are

First the shadow memory is calculated, in MiB

![Shadow memory in MiB](http://xapi-project.github.io/xen-api/doc/design/shadow.svg)
![Shadow memory in MiB](shadow.svg)

Second the VM overhead is calculated, in MiB

![Memory overhead in MiB](http://xapi-project.github.io/xen-api/doc/design/overhead.svg)
![Memory overhead in MiB](overhead.svg)

Memory required to start a VM
-----------------------------
Expand Down

0 comments on commit fcfa86a

Please sign in to comment.