Merge lp:~nataliabidart/ubuntuone-client/handle-sys-server-error into lp:ubuntuone-client

[Natalia Bidart]

States now handles a new event called SYS_SERVER_ERROR.

States now handles a new event called SYS_SERVER_ERROR.

This new event is emitted when the server sends any error message in (TRY_AGAIN, INTERNAL_ERROR, PROTOCOL_ERROR, or any queue_manager related event) while the client is in either of these states:

 * check_version, set_capabilities, authenticate, server_rescan

[Natalia Bidart (nataliabidart)]

Please note that the first file in the diff below is the state manager diagram update.

[John Lenton (chipaca)]

Is this a fix for something that is going into Lucid? If so, please link it. If not, I'm afraid it would be a lot easier if we merge it after the freeze.

review: Needs Information

[John Lenton (chipaca)]

OK, brown paper bag for me. I promise I *looked* for the bugs.
Getting more coffee, now.

[John Lenton (chipaca)]

review: Abstain

[John Lenton (chipaca)]

Beautiful.

review: Approve

[lp:~nataliabidart/ubuntuone-client/handle-sys-server-error]

483. By Natalia Bidart on 2010-04-12

Correctly updated the diagram (match typography and arrow colors).

484. By Natalia Bidart on 2010-04-12

Merged trunk in.

485. By Natalia Bidart on 2010-04-12

Adding on_enter signaling in SVG diagram for SYS_SERVER_ERROR.

486. By Natalia Bidart on 2010-04-12

Adding test cases for asserting that SYS_SERVER_ERROR execute AQ.diconnect when enetring STANDOFF.

487. By Natalia Bidart on 2010-04-12

Adding missing test.

[Facundo Batista (facundo)]

Looks ok!

review: Approve

=== modified file 'docs/states_manager.svg'
--- docs/states_manager.svg	2010-03-11 15:29:45 +0000
+++ docs/states_manager.svg	2010-04-12 16:25:47 +0000
@@ -28,15 +28,15 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1.0427072"
-     inkscape:cx="427.40282"
-     inkscape:cy="337.25026"
+     inkscape:cx="495.3424"
+     inkscape:cy="229.5042"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1010"
+     inkscape:window-width="1410"
+     inkscape:window-height="875"
      inkscape:window-x="0"
-     inkscape:window-y="24"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      showguides="true"
      inkscape:guide-bbox="true" />
@@ -5773,6 +5773,222 @@
          style="fill:#796a69;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
          transform="matrix(-0.4,0,0,-0.4,-4,0)" />
     </marker>
+    <inkscape:perspective
+       id="perspective3950"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-50"
+       style="overflow:visible">
+      <path
+         id="path3429-963"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <inkscape:perspective
+       id="perspective3978"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <marker
+       inkscape:stockid="Arrow1Mend1u64"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend1u64-085"
+       style="overflow:visible">
+      <path
+         id="path7114-06"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill:#796a69;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <inkscape:perspective
+       id="perspective4005"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4035"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-00"
+       style="overflow:visible">
+      <path
+         id="path3429-46"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <inkscape:perspective
+       id="perspective4063"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <marker
+       inkscape:stockid="Arrow1Mend1u64"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend1u64-52"
+       style="overflow:visible">
+      <path
+         id="path7114-90"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill:#796a69;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <inkscape:perspective
+       id="perspective4090"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4115"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-38"
+       style="overflow:visible">
+      <path
+         id="path3429-33"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <inkscape:perspective
+       id="perspective4143"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <marker
+       inkscape:stockid="Arrow1Mend1u64"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend1u64-80"
+       style="overflow:visible">
+      <path
+         id="path7114-47"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill:#796a69;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <inkscape:perspective
+       id="perspective4170"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4195"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-49"
+       style="overflow:visible">
+      <path
+         id="path3429-274"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <inkscape:perspective
+       id="perspective4223"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <marker
+       inkscape:stockid="Arrow1Mend1u64"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend1u64-524"
+       style="overflow:visible">
+      <path
+         id="path7114-43"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill:#796a69;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <inkscape:perspective
+       id="perspective4250"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective6024"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective6049"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective6071"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective6093"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
   </defs>
   <metadata
      id="metadata7">
@@ -6336,12 +6552,12 @@
        sodipodi:nodetypes="cc" />
     <path
        style="color:#000000;fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow1Mend);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 571.8587,341.01188 -145.11447,0"
+       d="m 572.26135,343.4914 -145.51712,0"
        id="path9275-2"
        sodipodi:nodetypes="cc" />
     <path
        style="color:#000000;fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow1Mend);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 372.71993,490.07195 0,-94.59591"
+       d="m 362.71993,490.07195 0,-94.59591"
        id="path9275-6"
        sodipodi:nodetypes="cc" />
     <path
@@ -6648,7 +6864,7 @@
        style="opacity:0.65322583;color:#000000;fill:#00ff00;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        sodipodi:type="arc" />
     <path
-       transform="matrix(0.24411038,0,0,0.22458156,478.23982,249.72461)"
+       transform="matrix(0.24411038,0,0,0.22458156,478.23982,252.20413)"
        d="m -147.4098,407.55515 a 42.646858,47.282387 0 1 1 -85.29371,0 42.646858,47.282387 0 1 1 85.29371,0 z"
        sodipodi:ry="47.282387"
        sodipodi:rx="42.646858"
@@ -6668,7 +6884,7 @@
        style="opacity:0.65322583;color:#000000;fill:#00ff00;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        sodipodi:type="arc" />
     <path
-       transform="matrix(0.24411038,0,0,0.22458156,418.94169,307.73364)"
+       transform="matrix(0.24411038,0,0,0.22458156,408.94169,307.89244)"
        d="m -147.4098,407.55515 a 42.646858,47.282387 0 1 1 -85.29371,0 42.646858,47.282387 0 1 1 85.29371,0 z"
        sodipodi:ry="47.282387"
        sodipodi:rx="42.646858"
@@ -6912,51 +7128,50 @@
            sodipodi:role="line">main.server_rescan()</tspan></text>
     </g>
     <g
-       id="g18667"
-       transform="translate(-958.19986,-397.59227)">
+       id="g6115">
       <rect
          style="opacity:0.65322583;color:#000000;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.847;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          id="rect5912-2-48-2-9"
-         width="129.83394"
+         width="86.677048"
          height="19.030485"
-         x="1082.8829"
-         y="699.63757"
+         x="146.26151"
+         y="304.41919"
          ry="4.5156531"
-         rx="4.5156531" />
+         rx="3.014647" />
       <text
          id="text2461-6-7-4-5"
-         y="712.1601"
-         x="1112.7266"
+         y="316.94171"
+         x="154.5267"
          style="font-size:10.90068817px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
          xml:space="preserve"
          sodipodi:linespacing="125%"><tspan
            id="tspan2463-3-5-2-7"
-           y="712.1601"
-           x="1112.7266"
+           y="316.94171"
+           x="154.5267"
            sodipodi:role="line">AQ.cleanup()</tspan></text>
     </g>
     <g
-       id="g18737"
-       transform="translate(-809.4024,-486.18015)">
+       id="g6107"
+       transform="translate(0,-2.3738785)">
       <rect
          style="opacity:0.65322583;color:#000000;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.847;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          id="rect5912-2-48-2-9-2"
-         width="129.83394"
+         width="99.624115"
          height="19.030485"
-         x="1116.191"
-         y="840.97321"
+         x="307.89352"
+         y="306.79306"
          ry="4.5156531"
-         rx="4.5156531" />
+         rx="3.4649487" />
       <text
          id="text2461-6-7-4-26"
-         y="853.91089"
-         x="1138.0615"
+         y="319.73074"
+         x="314.65912"
          style="font-size:10.90068817px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
          xml:space="preserve"
          sodipodi:linespacing="125%"><tspan
            id="tspan2463-3-5-2-6"
-           y="853.91089"
-           x="1138.0615"
+           y="319.73074"
+           x="314.65912"
            sodipodi:role="line">AQ.disconnect()</tspan></text>
     </g>
     <text
@@ -7060,36 +7275,36 @@
        xml:space="preserve"
        style="font-size:25.45085716px;font-style:italic;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans"
        x="492.18253"
-       y="336.1264"
+       y="339.92773"
        id="text2467-1-5-4-8-7"><tspan
          sodipodi:role="line"
          id="tspan2469-4-3-8-6-75"
          x="492.18253"
-         y="336.1264"
+         y="339.92773"
          style="font-size:16.19600105px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono">5,6,8</tspan></text>
     <text
        sodipodi:linespacing="125%"
        xml:space="preserve"
        style="font-size:25.45085716px;font-style:italic;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans"
-       x="361.26068"
-       y="454.80966"
+       x="324.56741"
+       y="425.54156"
        id="text2467-1-5-4-8-7-2"><tspan
          sodipodi:role="line"
          id="tspan2469-4-3-8-6-75-3"
-         x="361.26068"
-         y="454.80966"
+         x="324.56741"
+         y="425.54156"
          style="font-size:16.19600105px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono">5,6,8</tspan></text>
     <text
        sodipodi:linespacing="125%"
        xml:space="preserve"
        style="font-size:25.45085716px;font-style:italic;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans"
-       x="464.76147"
-       y="451.65814"
+       x="419.70853"
+       y="425.54156"
        id="text2467-1-5-4-8-7-7"><tspan
          sodipodi:role="line"
          id="tspan2469-4-3-8-6-75-2"
-         x="464.76147"
-         y="451.65814"
+         x="419.70853"
+         y="425.54156"
          style="font-size:16.19600105px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono">5,6,8</tspan></text>
     <text
        sodipodi:linespacing="125%"
@@ -7353,13 +7568,13 @@
        sodipodi:linespacing="125%"
        xml:space="preserve"
        style="font-size:25.45085716px;font-style:italic;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans"
-       x="234.69305"
-       y="438.2403"
+       x="275.69043"
+       y="425.54156"
        id="text2467-1-5-4-8-7-4-1"><tspan
          sodipodi:role="line"
          id="tspan2469-4-3-8-6-75-4-5"
-         x="234.69305"
-         y="438.2403"
+         x="275.69043"
+         y="425.54156"
          style="font-size:16.19600105px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono">5,6</tspan></text>
     <g
        style="display:inline"
@@ -7496,5 +7711,115 @@
          x="916.75098"
          y="655.28705"
          style="font-size:8.20300102px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#967b71;fill-opacity:1;stroke:none;stroke-width:2;marker:none;marker-end:url(#Arrow1Mend1u64);visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono">SYS_ROOT_MISMATCH</tspan></text>
+    <path
+       style="color:#000000;fill:none;stroke:#967b71;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow1Mend1u64);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 557.37378,496.31282 421.57479,365.62324"
+       id="path8788-5-8"
+       sodipodi:nodetypes="cc" />
+    <text
+       sodipodi:linespacing="125%"
+       xml:space="preserve"
+       style="font-size:16.76553154px;font-style:italic;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#967b71;fill-opacity:1;stroke:none;stroke-width:2;marker:none;marker-end:url(#Arrow1Mend1u64);visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans"
+       x="380.17734"
+       y="482.4263"
+       id="text2467-1-5-4-7-3-63-2-2"><tspan
+         sodipodi:role="line"
+         x="380.17734"
+         y="482.4263"
+         style="font-size:10.66897488px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#967b71;fill-opacity:1;stroke:none;stroke-width:2;marker:none;marker-end:url(#Arrow1Mend1u64);visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono"
+         id="tspan6246-8">SYS_SERVER_ERROR</tspan></text>
+    <path
+       style="color:#000000;fill:none;stroke:#967b71;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow1Mend1u64);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 378.61158,489.54194 0,-94.59591"
+       id="path9275-6-2"
+       sodipodi:nodetypes="cc" />
+    <text
+       sodipodi:linespacing="125%"
+       xml:space="preserve"
+       style="font-size:16.76553154px;font-style:italic;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#967b71;fill-opacity:1;stroke:none;stroke-width:2;marker:none;marker-end:url(#Arrow1Mend1u64);visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans"
+       x="600.11841"
+       y="-29.468037"
+       id="text2467-1-5-4-7-3-63-2-2-4"
+       transform="matrix(0.7250614,0.68868423,-0.68868423,0.7250614,0,0)"><tspan
+         sodipodi:role="line"
+         x="600.11841"
+         y="-29.468037"
+         style="font-size:10.66897488px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#967b71;fill-opacity:1;stroke:none;stroke-width:2;marker:none;marker-end:url(#Arrow1Mend1u64);visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono"
+         id="tspan6246-8-0">SYS_SERVER_ERROR</tspan></text>
+    <path
+       style="color:#000000;fill:none;stroke:#967b71;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow1Mend1u64);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 185.31373,496.90742 321.11272,365.6576"
+       id="path8788-3"
+       sodipodi:nodetypes="cc" />
+    <text
+       sodipodi:linespacing="125%"
+       xml:space="preserve"
+       style="font-size:16.76553154px;font-style:italic;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#967b71;fill-opacity:1;stroke:none;stroke-width:2;marker:none;marker-end:url(#Arrow1Mend1u64);visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans"
+       x="-153.51541"
+       y="485.33597"
+       id="text2467-1-5-4-7-3-63-2-2-4-8"
+       transform="matrix(0.73963232,-0.67301117,0.67301117,0.73963232,0,0)"><tspan
+         sodipodi:role="line"
+         x="-153.51541"
+         y="485.33597"
+         style="font-size:10.66897488px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#967b71;fill-opacity:1;stroke:none;stroke-width:2;marker:none;marker-end:url(#Arrow1Mend1u64);visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono"
+         id="tspan6246-8-0-3">SYS_SERVER_ERROR</tspan></text>
+    <path
+       style="color:#000000;fill:none;stroke:#967b71;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow1Mend1u64);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 574.95502,323.51184 -149.79791,0"
+       id="path9275-2-2"
+       sodipodi:nodetypes="cc" />
+    <text
+       sodipodi:linespacing="125%"
+       xml:space="preserve"
+       style="font-size:16.76553154px;font-style:italic;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#967b71;fill-opacity:1;stroke:none;stroke-width:2;marker:none;marker-end:url(#Arrow1Mend1u64);visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans"
+       x="455.54834"
+       y="319.22873"
+       id="text2467-1-5-4-7-3-63-2-2-4-3"><tspan
+         sodipodi:role="line"
+         x="455.54834"
+         y="319.22873"
+         style="font-size:10.66897488px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#967b71;fill-opacity:1;stroke:none;stroke-width:2;marker:none;marker-end:url(#Arrow1Mend1u64);visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono"
+         id="tspan6246-8-0-37">SYS_SERVER_ERROR</tspan></text>
+    <path
+       transform="matrix(0.24411038,0,0,0.22458156,477.77985,231.98247)"
+       d="m -147.4098,407.55515 a 42.646858,47.282387 0 1 1 -85.29371,0 42.646858,47.282387 0 1 1 85.29371,0 z"
+       sodipodi:ry="47.282387"
+       sodipodi:rx="42.646858"
+       sodipodi:cy="407.55515"
+       sodipodi:cx="-190.05666"
+       id="path4627-2-8-04-9-0"
+       style="opacity:0.65322583;color:#000000;fill:#00ff00;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(0.24411038,0,0,0.22458156,424.90668,307.89244)"
+       d="m -147.4098,407.55515 a 42.646858,47.282387 0 1 1 -85.29371,0 42.646858,47.282387 0 1 1 85.29371,0 z"
+       sodipodi:ry="47.282387"
+       sodipodi:rx="42.646858"
+       sodipodi:cy="407.55515"
+       sodipodi:cx="-190.05666"
+       id="path4627-2-8-04-2-8"
+       style="opacity:0.65322583;color:#000000;fill:#00ff00;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(0.24411038,0,0,0.22458156,363.47805,278.43485)"
+       d="m -147.4098,407.55515 a 42.646858,47.282387 0 1 1 -85.29371,0 42.646858,47.282387 0 1 1 85.29371,0 z"
+       sodipodi:ry="47.282387"
+       sodipodi:rx="42.646858"
+       sodipodi:cy="407.55515"
+       sodipodi:cx="-190.05666"
+       id="path4627-2-8-04-3-2"
+       style="opacity:0.65322583;color:#000000;fill:#00ff00;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(0.24411038,0,0,0.22458156,472.12752,278.49479)"
+       d="m -147.4098,407.55515 a 42.646858,47.282387 0 1 1 -85.29371,0 42.646858,47.282387 0 1 1 85.29371,0 z"
+       sodipodi:ry="47.282387"
+       sodipodi:rx="42.646858"
+       sodipodi:cy="407.55515"
+       sodipodi:cx="-190.05666"
+       id="path4627-2-8-04-1-5"
+       style="opacity:0.65322583;color:#000000;fill:#00ff00;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:type="arc" />
   </g>
 </svg>

=== modified file 'tests/syncdaemon/test_states.py'
--- tests/syncdaemon/test_states.py	2010-03-15 19:18:32 +0000
+++ tests/syncdaemon/test_states.py	2010-04-12 16:25:47 +0000
@@ -630,6 +630,7 @@
 
 class TestConnectionManagerTimings(Base):
     """Times handled by ConnectionManager."""
+
     def setUp(self):
         Base.setUp(self)
 
@@ -651,7 +652,7 @@
     def test_handshaketimeout_setcapabilities(self):
         """Handshake timing is controlled in SetCapabilities."""
         return self.check('CHECK_VERSION', 'SYS_PROTOCOL_VERSION_OK',
-                   'SYS_HANDSHAKE_TIMEOUT')
+                          'SYS_HANDSHAKE_TIMEOUT')
 
     def test_handshaketimeout_authenticate(self):
         """Handshake timing is controlled in Authenticate."""
@@ -755,6 +756,10 @@
         return self.check('CHECK_VERSION', 'SYS_PROTOCOL_VERSION_ERROR',
                           'BAD_VERSION')
 
+    def test_checkversion_server_error(self):
+        """Transition CheckVersion -> Standoff."""
+        return self.check('CHECK_VERSION', 'SYS_SERVER_ERROR', 'STANDOFF')
+
     def test_setcapabilities_authenticate(self):
         """Transition SetCapabilities -> Authenticate."""
         return self.check('SET_CAPABILITIES', 'SYS_SET_CAPABILITIES_OK',
@@ -765,6 +770,10 @@
         return self.check('SET_CAPABILITIES', 'SYS_SET_CAPABILITIES_ERROR',
                           'CAPABILITIES_MISMATCH')
 
+    def test_setcapabilities_server_error(self):
+        """Transition SetCapabilities -> Standoff."""
+        return self.check('SET_CAPABILITIES', 'SYS_SERVER_ERROR', 'STANDOFF')
+
     def test_authenticate_serverrescan(self):
         """Transition Authenticate -> ServerRescan."""
         return self.check('AUTHENTICATE', 'SYS_AUTH_OK', 'SERVER_RESCAN')
@@ -773,11 +782,19 @@
         """Transition Authenticate -> Error."""
         return self.check('AUTHENTICATE', 'SYS_AUTH_ERROR', 'AUTH_FAILED')
 
+    def test_authenticate_server_error(self):
+        """Transition Authenticate -> Standoff."""
+        return self.check('AUTHENTICATE', 'SYS_SERVER_ERROR', 'STANDOFF')
+
     def test_serverrescan_queuemanager(self):
         """Transition ServerRescan -> QueueManager."""
         return self.check('SERVER_RESCAN', 'SYS_SERVER_RESCAN_DONE',
                           'QUEUE_MANAGER')
 
+    def test_serverrescan_standoff(self):
+        """Transition ServerRescan -> Standoff."""
+        return self.check('SERVER_RESCAN', 'SYS_SERVER_ERROR', 'STANDOFF')
+
     def test_network_events(self):
         """Don't make transition, and don't log warning."""
         nodes = ['INIT', 'READY', 'STANDOFF', 'QUEUE_MANAGER'] # examples
@@ -953,6 +970,7 @@
             d.append(self.check(node, 'SYS_CONNECTION_LOST', node))
             d.append(self.check(node, 'SYS_HANDSHAKE_TIMEOUT', node))
             d.append(self.check(node, 'SYS_CONNECTION_MADE', node))
+            d.append(self.check(node, 'SYS_SERVER_ERROR', node))
         return defer.DeferredList(d)
 
 
@@ -1093,7 +1111,7 @@
         nodes = (StateManager.CHECK_VERSION, StateManager.SET_CAPABILITIES,
                  StateManager.AUTHENTICATE)
         events = ('SYS_NET_DISCONNECTED', 'SYS_USER_DISCONNECT',
-                  'SYS_HANDSHAKE_TIMEOUT')
+                  'SYS_HANDSHAKE_TIMEOUT', 'SYS_SERVER_ERROR')
         cnt = 0
         for node in nodes:
             for event in events:
@@ -1113,6 +1131,14 @@
         # from QUEUE_MANAGER
         self.assertEqual(self.aq.actions.count('disconnect'), cnt)
 
+    def test_server_rescan_to_standoff(self):
+        """ServerRescan transitions to Standoff generates an AQ.disconnect."""
+        # case of ServerRescan and SYS_SERVER_ERROR
+        self.aq.actions[:] = []
+        self.sm.state = StateManager.SERVER_RESCAN
+        self.sm.handle_default('SYS_SERVER_ERROR')
+        self.assertEqual(self.aq.actions, ['disconnect'])
+
     def test_exit_queuemanager(self):
         """Exit transitions from QueueManager."""
         events = ('SYS_NET_DISCONNECTED', 'SYS_USER_DISCONNECT',

=== modified file 'ubuntuone/syncdaemon/states.py'
--- ubuntuone/syncdaemon/states.py	2010-03-11 15:29:45 +0000
+++ ubuntuone/syncdaemon/states.py	2010-04-12 16:25:47 +0000
@@ -343,6 +343,7 @@
     'SYS_PROTOCOL_VERSION_OK',
     'SYS_ROOT_MISMATCH',
     'SYS_SERVER_RESCAN_DONE',
+    'SYS_SERVER_ERROR',
     'SYS_SET_CAPABILITIES_ERROR',
     'SYS_SET_CAPABILITIES_OK',
     'SYS_UNKNOWN_ERROR',
@@ -406,17 +407,25 @@
             (self.READY, 'SYS_CONNECTION_MADE'): _from_ready,
             (self.READY, 'SYS_CONNECTION_FAILED'): self.WAITING,
             (self.WAITING, 'SYS_CONNECTION_RETRY'): self.READY,
+
             (self.CHECK_VERSION, 'SYS_PROTOCOL_VERSION_OK'):
                                                     self.SET_CAPABILITIES,
             (self.CHECK_VERSION, 'SYS_PROTOCOL_VERSION_ERROR'):
                                                     self.BAD_VERSION,
+            (self.CHECK_VERSION, 'SYS_SERVER_ERROR'): self.STANDOFF,
+
             (self.SET_CAPABILITIES, 'SYS_SET_CAPABILITIES_OK'):
                                                     self.AUTHENTICATE,
             (self.SET_CAPABILITIES, 'SYS_SET_CAPABILITIES_ERROR'):
                                                     self.CAPABILITIES_MISMATCH,
+            (self.SET_CAPABILITIES, 'SYS_SERVER_ERROR'): self.STANDOFF,
+
             (self.AUTHENTICATE, 'SYS_AUTH_OK'): self.SERVER_RESCAN,
             (self.AUTHENTICATE, 'SYS_AUTH_ERROR'): self.AUTH_FAILED,
+            (self.AUTHENTICATE, 'SYS_SERVER_ERROR'): self.STANDOFF,
+
             (self.SERVER_RESCAN, 'SYS_SERVER_RESCAN_DONE'): self.QUEUE_MANAGER,
+            (self.SERVER_RESCAN, 'SYS_SERVER_ERROR'): self.STANDOFF,
         }
 
     def handle_default(self, event, *args, **kwargs):