Skip to content

Commit

Permalink
Documentation: in the Emaj_web usage chapter, add a screenshot of the…
Browse files Browse the repository at this point in the history
… new rollback details page.
  • Loading branch information
beaud76 committed Mar 27, 2020
1 parent 2da9d2a commit 7d2646d
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 4 deletions.
17 changes: 16 additions & 1 deletion docs/en/webUsage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,21 @@ For each consolidable rollback, a button allows to effectively consolidate the o

Figure 12 – Rollback operations monitoring.

Clicking on a rollback identifier in one of these tables displays a page that shows information details about the selected in progress or completed operation.

More precisely, are displayed:

* the rollback identification,
* its progress,
* the final report returned to the user, when the operation is completed,
* its main technical characteristics,
* the launched session or sessions,
* and the detail of the operation plan, showing each elementary step, with its duration and optionaly estimates computed by E-Maj at the operation initialisation.

.. figure:: images/emajweb_rollbackdetails.png
:align: center

Figure 13 – Details of a Rollback operation.

E-Maj environment state
-----------------------
Expand All @@ -218,4 +233,4 @@ Two buttons allow to export and import parameters configurations to or from a lo
.. figure:: images/emajweb_emaj.png
:align: center

Figure 13 – The E-Maj environment state.
Figure 14 – The E-Maj environment state.
18 changes: 16 additions & 2 deletions docs/fr/webUsage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,21 @@ Pour chaque rollback tracé consolidable listé, un bouton permet d’exécuter

Figure 12 – Suivi des opérations de rollback.

En cliquant sur un identifiant de rollback dans l’un de ces tableaux, on accède à une page présentant des informations détaillées sur le déroulement en cours ou passé de l’opération sélectionnée.

On y trouve plus précisément des données concernant :

* l’identification du rollback,
* sa progression,
* le rapport final restitué à l’utilisateur, quand l’opération est terminée,
* ses principales caractéristiques techniques,
* la ou les sessions lancées,
* et le détail de la planification de l’opération, montrant chaque étape élémentaire, avec notamment sa durée, et optionnellement les estimations initiales calculées par E-Maj.

.. figure:: images/emajweb_rollbackdetails.png
:align: center

Figure 13 – Détails d’une opération de rollback.

État de l'environnement E-Maj
-----------------------------
Expand All @@ -218,5 +233,4 @@ Deux boutons en bas de page permettent d’exporter ou d’importer une configur
.. figure:: images/emajweb_emaj.png
:align: center

Figure 13 – État de l'environnement E-Maj

Figure 14 – État de l'environnement E-Maj
2 changes: 1 addition & 1 deletion test/sql/rollback.sql
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,7 @@ begin;
select rlbk_id, rlbk_status, rlbk_remaining, rlbk_completion_pct from emaj._rollback_activity();
select 1.0 - ((20.0 - 19.0)) / (124.1 + (20.0 - 19.0)); -- the completion % should be 99%
rollback;

begin;
-- 1 rollback operation in LOCKING state and without step other than LOCK_TABLE
insert into emaj.emaj_time_stamp (time_id, time_tx_timestamp) values (-1, now()-'2 minutes'::interval);
Expand Down Expand Up @@ -558,7 +559,6 @@ begin;
select * from emaj.emaj_mark where mark_group = 'emptyGroup' order by mark_time_id, mark_group;
rollback;


-- check that dropping the group deletes rows from emaj_sequence and emaj_seq_hole
begin;
select emaj.emaj_stop_group('myGroup1');
Expand Down

0 comments on commit 7d2646d

Please sign in to comment.