Skip to content

CLOUDSTACK-10012: Jetty 9.4 - #2329

Merged
yadvr merged 10 commits into
apache:masterfrom
marcaurele:gzip
Nov 17, 2017
Merged

CLOUDSTACK-10012: Jetty 9.4#2329
yadvr merged 10 commits into
apache:masterfrom
marcaurele:gzip

Conversation

@marcaurele

@marcaurelemarcaurele commented Nov 16, 2017

Copy link
Copy Markdown
Member

Upgrading to jetty 9.4 along with:

  • new gzip handler
  • redirect / to the context path
  • add session timeout configuration
  • change for cloudian tests

@marcaurelemarcaurele changed the title Jetty 9.4CLOUDSTACK-10012: Jetty 9.4Nov 16, 2017
@marcaurele

Copy link
Copy Markdown
MemberAuthor

superseed #2328 (Jetty 9.4 is Java8 compatible)
cc @rhtyd @wido

Comment threadclient/conf/server.properties.in Outdated
http.port=8080

# Max inactivity time in minutes for the session
session.timeout=10

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@marcaurele Can we bump the default to 30 minutes? I suppose 10 minutes might be too low, or maybe we can hit the sweet spot at 20mins?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree that 10 minutes is very short. I would prefer 30

@yadvr

Copy link
Copy Markdown
Member

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan

Copy link
Copy Markdown

Packaging result: ✖centos6 ✔centos7 ✖debian. JID-1263

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
@yadvr

Copy link
Copy Markdown
Member

@marcaurele I've fixed the cloudian unit test failures and the session timeout to 30 (mins).

@yadvr

Copy link
Copy Markdown
Member

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@yadvr

Copy link
Copy Markdown
Member

@marcaurele how do you start the jetty server with mvn, when I run mvn -pl :cloud-client-ui jetty:run -Dnoredist -Dsimulator -Djava.net.preferIPv4Stack=true it does not run the server for me.

@blueorangutan

Copy link
Copy Markdown

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1264

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
@yadvr

Copy link
Copy Markdown
Member

@marcaurele I found a workaround to use the old 9.2.x jetty-maven-plugin as the newer one did not work for me (and Travis). Please review the changes.
LGTM from my side.

@yadvr

Copy link
Copy Markdown
Member

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan

Copy link
Copy Markdown

Packaging result: ✔centos6 ✔centos7 ✖debian. JID-1265

@yadvr

Copy link
Copy Markdown
Member

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan

Copy link
Copy Markdown

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1268

@yadvr

Copy link
Copy Markdown
Member

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@blueorangutan

Copy link
Copy Markdown

Trillian test result (tid-1658)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 42208 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2329-t1658-kvm-centos7.zip
Intermitten failure detected: /marvin/tests/smoke/test_affinity_groups_projects.py
Intermitten failure detected: /marvin/tests/smoke/test_affinity_groups.py
Intermitten failure detected: /marvin/tests/smoke/test_certauthority_root.py
Intermitten failure detected: /marvin/tests/smoke/test_deploy_virtio_scsi_vm.py
Intermitten failure detected: /marvin/tests/smoke/test_deploy_vm_root_resize.py
Intermitten failure detected: /marvin/tests/smoke/test_deploy_vms_with_varied_deploymentplanners.py
Intermitten failure detected: /marvin/tests/smoke/test_deploy_vm_with_userdata.py
Intermitten failure detected: /marvin/tests/smoke/test_host_annotations.py
Intermitten failure detected: /marvin/tests/smoke/test_internal_lb.py
Intermitten failure detected: /marvin/tests/smoke/test_iso.py
Intermitten failure detected: /marvin/tests/smoke/test_list_ids_parameter.py
Intermitten failure detected: /marvin/tests/smoke/test_loadbalance.py
Intermitten failure detected: /marvin/tests/smoke/test_metrics_api.py
Intermitten failure detected: /marvin/tests/smoke/test_multipleips_per_nic.py
Intermitten failure detected: /marvin/tests/smoke/test_network_acl.py
Intermitten failure detected: /marvin/tests/smoke/test_network.py
Intermitten failure detected: /marvin/tests/smoke/test_nic.py
Intermitten failure detected: /marvin/tests/smoke/test_password_server.py
Intermitten failure detected: /marvin/tests/smoke/test_portforwardingrules.py
Intermitten failure detected: /marvin/tests/smoke/test_primary_storage.py
Intermitten failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermitten failure detected: /marvin/tests/smoke/test_reset_vm_on_reboot.py
Intermitten failure detected: /marvin/tests/smoke/test_router_dhcphosts.py
Intermitten failure detected: /marvin/tests/smoke/test_router_dns.py
Intermitten failure detected: /marvin/tests/smoke/test_router_dnsservice.py
Intermitten failure detected: /marvin/tests/smoke/test_routers_iptables_default_policy.py
Intermitten failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Intermitten failure detected: /marvin/tests/smoke/test_routers.py
Intermitten failure detected: /marvin/tests/smoke/test_service_offerings.py
Intermitten failure detected: /marvin/tests/smoke/test_snapshots.py
Intermitten failure detected: /marvin/tests/smoke/test_templates.py
Intermitten failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Intermitten failure detected: /marvin/tests/smoke/test_vm_snapshots.py
Intermitten failure detected: /marvin/tests/smoke/test_volumes.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_router_nics.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Test completed. 27 look OK, 36 have error(s)

TestResultTime (s)Test File
test_01_vpc_remote_access_vpnFailure45.84test_vpc_vpn.py
test_02_VPC_default_routesFailure66.69test_vpc_router_nics.py
test_01_VPC_nics_after_destroyFailure66.68test_vpc_router_nics.py
test_05_rvpc_multi_tiersFailure181.61test_vpc_redundant.py
test_04_rvpc_privategw_static_routesFailure298.67test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanupFailure127.57test_privategw_acl.py
test_02_vpc_privategw_static_routesFailure82.16test_privategw_acl.py
test_01_vpc_privategw_aclFailure87.39test_privategw_acl.py
test_01_create_isoFailure1516.14test_iso.py
ContextSuite context=TestVolumes>:setupError0.00test_volumes.py
ContextSuite context=TestCreateVolume>:setupError0.00test_volumes.py
ContextSuite context=TestVmSnapshot>:setupError66.38test_vm_snapshots.py
ContextSuite context=TestVMLifeCycle>:setupError0.00test_vm_life_cycle.py
ContextSuite context=TestDeployVM>:setupError0.00test_vm_life_cycle.py
ContextSuite context=TestTemplates>:setupError72.27test_templates.py
ContextSuite context=TestSnapshotRootDisk>:setupError0.00test_snapshots.py
ContextSuite context=TestServiceOfferings>:setupError71.63test_service_offerings.py
test_02_isolate_network_FW_PF_default_routes_egress_falseError96.15test_routers_network_ops.py
test_01_isolate_network_FW_PF_default_routes_egress_trueError106.11test_routers_network_ops.py
ContextSuite context=TestRedundantIsolateNetworks>:setupError1642.05test_routers_network_ops.py
test_02_routervm_iptables_policiesError55.60test_routers_iptables_default_policy.py
test_01_single_VPC_iptables_policiesError66.11test_routers_iptables_default_policy.py
test_01_single_VPC_iptables_policiesError91.46test_routers_iptables_default_policy.py
ContextSuite context=TestRouterServices>:setupError0.00test_routers.py
ContextSuite context=TestRouterDnsService>:setupError0.00test_router_dnsservice.py
ContextSuite context=TestRouterDns>:setupError0.00test_router_dns.py
ContextSuite context=TestRouterDHCPOpts>:setupError0.00test_router_dhcphosts.py
ContextSuite context=TestRouterDHCPHosts>:setupError0.00test_router_dhcphosts.py
ContextSuite context=TestResetVmOnReboot>:setupError0.00test_reset_vm_on_reboot.py
test_04_rvpc_privategw_static_routesError308.90test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanupError137.83test_privategw_acl.py
test_02_vpc_privategw_static_routesError92.37test_privategw_acl.py
test_01_primary_storage_nfsError0.21test_primary_storage.py
test_01_add_primary_storage_disabled_hostError133.10test_primary_storage.py
ContextSuite context=TestStorageTags>:setupError0.33test_primary_storage.py
test_01_create_delete_portforwarding_fornonvpcError112.33test_portforwardingrules.py
ContextSuite context=TestIsolatedNetworksPasswdServer>:setupError0.00test_password_server.py
test_01_nicError76.84test_nic.py
test_network_aclError106.47test_network_acl.py
test_releaseIPError56.44test_network.py
test_reboot_routerError51.31test_network.py
test_delete_accountError51.40test_network.py
ContextSuite context=TestRouterRules>:setupError112.83test_network.py
ContextSuite context=TestPortForwarding>:setupError178.26test_network.py
test_nic_secondaryip_add_removeError51.30test_multipleips_per_nic.py
test_list_vms_metricsError5.41test_metrics_api.py
ContextSuite context=TestLoadBalance>:setupError0.00test_loadbalance.py
ContextSuite context=TestListIdsParams>:setupError0.00test_list_ids_parameter.py
test_04_create_iso_with_no_checksumError65.71test_iso.py
test_03_create_iso_with_checksum_md5Error65.65test_iso.py
test_03_create_iso_with_checksum_md5Error70.74test_iso.py
test_03_1_create_iso_with_checksum_md5_negativeError70.86test_iso.py
test_02_create_iso_with_checksum_sha256Error65.61test_iso.py
test_02_1_create_iso_with_checksum_sha256_negativeError70.75test_iso.py
test_01_create_iso_with_checksum_sha1Error65.58test_iso.py
test_01_create_iso_with_checksum_sha1Error70.71test_iso.py
test_01_1_create_iso_with_checksum_sha1_negativeError70.88test_iso.py
ContextSuite context=TestISO>:setupError3036.96test_iso.py
ContextSuite context=TestInternalLb>:setupError0.00test_internal_lb.py
test_05_add_annotation_for_invalid_entityTypeError0.10test_host_annotations.py
test_deployvm_userdispersingError30.40test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_userconcentratedError35.51test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_firstfitError100.99test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_userdata_postError20.55test_deploy_vm_with_userdata.py
test_deployvm_userdataError116.25test_deploy_vm_with_userdata.py
test_00_deploy_vm_root_resizeError166.35test_deploy_vm_root_resize.py
ContextSuite context=TestDeployVirtioSCSIVM>:setupError0.00test_deploy_virtio_scsi_vm.py
test_DeployVmAntiAffinityGroup_in_projectError131.24test_affinity_groups_projects.py
test_DeployVmAntiAffinityGroupError60.76test_affinity_groups.py
test_change_service_offering_for_vm_with_snapshotsSkipped0.00test_vm_snapshots.py
ContextSuite context=TestCreateTemplate>:setupSkipped0.00test_templates.py
ContextSuite context=TestCopyDeleteTemplate>:setupSkipped0.00test_templates.py
test_static_role_account_aclsSkipped0.03test_staticroles.py
test_11_ss_nfs_version_on_ssvmSkipped0.02test_ssvm.py
test_01_scale_vmSkipped0.00test_scale_vm.py
test_01_primary_storage_iscsiSkipped0.12test_primary_storage.py
test_vm_nic_adapter_vmxnet3Skipped0.00test_nic_adapter_type.py
test_03_nic_multiple_vmwareSkipped1.13test_nic.py
test_nested_virtualization_vmwareSkipped0.00test_nested_virtualization.py
test_list_ha_for_host_validSkipped0.02test_hostha_simulator.py
test_list_ha_for_host_invalidSkipped0.02test_hostha_simulator.py
test_list_ha_for_hostSkipped0.04test_hostha_simulator.py
test_hostha_enable_feature_without_setting_providerSkipped0.03test_hostha_simulator.py
test_hostha_enable_feature_validSkipped0.02test_hostha_simulator.py
test_hostha_disable_feature_validSkipped0.07test_hostha_simulator.py
test_hostha_configure_invalid_providerSkipped0.07test_hostha_simulator.py
test_hostha_configure_default_driverSkipped0.08test_hostha_simulator.py
test_ha_verify_fsm_recoveringSkipped0.07test_hostha_simulator.py
test_ha_verify_fsm_fencedSkipped0.07test_hostha_simulator.py
test_ha_verify_fsm_degradedSkipped0.07test_hostha_simulator.py
test_ha_verify_fsm_availableSkipped0.02test_hostha_simulator.py
test_ha_multiple_mgmt_server_ownershipSkipped0.03test_hostha_simulator.py
test_ha_list_providersSkipped0.07test_hostha_simulator.py
test_ha_enable_feature_invalidSkipped0.08test_hostha_simulator.py
test_ha_disable_feature_invalidSkipped0.07test_hostha_simulator.py
test_ha_configure_enabledisable_across_clusterzonesSkipped0.07test_hostha_simulator.py
test_configure_ha_provider_validSkipped0.07test_hostha_simulator.py
test_configure_ha_provider_invalidSkipped0.03test_hostha_simulator.py
test_hostha_kvm_host_recoveringSkipped31.18test_hostha_kvm.py
test_hostha_kvm_host_fencingSkipped36.24test_hostha_kvm.py
test_hostha_kvm_host_degradedSkipped61.39test_hostha_kvm.py
test_deploy_vgpu_enabled_vmSkipped0.03test_deploy_vgpu_enabled_vm.py
test_3d_gpu_supportSkipped0.04test_deploy_vgpu_enabled_vm.py

@yadvr

Copy link
Copy Markdown
Member

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan

Copy link
Copy Markdown

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1270

@yadvr

Copy link
Copy Markdown
Member

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

Signed-off-by: Marc-Aurèle Brothier <m@brothier.org>
@marcaurele

Copy link
Copy Markdown
MemberAuthor

I moved the plugin version to root pom properties.

@marcaurele

Copy link
Copy Markdown
MemberAuthor

LGTM

setKeystorePassword(properties.getProperty(KEYSTORE_PASSWORD));
setWebAppLocation(properties.getProperty(WEBAPP_DIR));
setAccessLogFile(properties.getProperty(ACCESS_LOG, "access.log"));
setSessionTimeout(Integer.valueOf(properties.getProperty(SESSION_TIMEOUT, "10")));

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@marcaurele you have a default value in the property file, which is 30, and here it is 10 (at line 85). Moreover, what about using the value of variable sessionTimeout as the default values? The variable already starts with the default value anyways.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I've synced default values to 30 now.

@rafaelweingartnerrafaelweingartner left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM from me here.

I only have a remark regarding the number of commits for such a small change. I understand that you have more than a person working here, but I believe the number of commits could be reduced.

@yadvr

Copy link
Copy Markdown
Member

@rafaelweingartner I'll squash merge them (I dislike splitting PRs in 10s+ of commits too)

@rafaelweingartner

Copy link
Copy Markdown
Member

@rhtyd thanks!

@blueorangutan

Copy link
Copy Markdown

Trillian test result (tid-1659)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 31296 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2329-t1659-kvm-centos7.zip
Intermitten failure detected: /marvin/tests/smoke/test_deploy_virtio_scsi_vm.py
Intermitten failure detected: /marvin/tests/smoke/test_host_annotations.py
Intermitten failure detected: /marvin/tests/smoke/test_internal_lb.py
Intermitten failure detected: /marvin/tests/smoke/test_iso.py
Intermitten failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Test completed. 59 look OK, 4 have error(s)

TestResultTime (s)Test File
test_01_vpc_remote_access_vpnFailure65.95test_vpc_vpn.py
test_04_rvpc_privategw_static_routesFailure258.56test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanupFailure183.02test_privategw_acl.py
test_02_vpc_privategw_static_routesFailure178.07test_privategw_acl.py
test_01_vpc_privategw_aclFailure61.67test_privategw_acl.py
test_04_extract_IsoFailure5.09test_iso.py
test_05_add_annotation_for_invalid_entityTypeError0.09test_host_annotations.py
test_change_service_offering_for_vm_with_snapshotsSkipped0.00test_vm_snapshots.py
test_09_copy_delete_templateSkipped0.03test_templates.py
test_06_copy_templateSkipped0.00test_templates.py
test_static_role_account_aclsSkipped0.02test_staticroles.py
test_11_ss_nfs_version_on_ssvmSkipped0.02test_ssvm.py
test_01_scale_vmSkipped0.00test_scale_vm.py
test_01_primary_storage_iscsiSkipped0.09test_primary_storage.py
test_vm_nic_adapter_vmxnet3Skipped0.00test_nic_adapter_type.py
test_03_nic_multiple_vmwareSkipped1.07test_nic.py
test_nested_virtualization_vmwareSkipped0.00test_nested_virtualization.py
test_06_copy_isoSkipped0.00test_iso.py
test_list_ha_for_host_validSkipped0.02test_hostha_simulator.py
test_list_ha_for_host_invalidSkipped0.03test_hostha_simulator.py
test_list_ha_for_hostSkipped0.02test_hostha_simulator.py
test_hostha_enable_feature_without_setting_providerSkipped0.02test_hostha_simulator.py
test_hostha_enable_feature_validSkipped0.02test_hostha_simulator.py
test_hostha_disable_feature_validSkipped0.02test_hostha_simulator.py
test_hostha_configure_invalid_providerSkipped0.02test_hostha_simulator.py
test_hostha_configure_default_driverSkipped0.02test_hostha_simulator.py
test_ha_verify_fsm_recoveringSkipped0.03test_hostha_simulator.py
test_ha_verify_fsm_fencedSkipped0.02test_hostha_simulator.py
test_ha_verify_fsm_degradedSkipped0.02test_hostha_simulator.py
test_ha_verify_fsm_availableSkipped0.02test_hostha_simulator.py
test_ha_multiple_mgmt_server_ownershipSkipped0.03test_hostha_simulator.py
test_ha_list_providersSkipped0.02test_hostha_simulator.py
test_ha_enable_feature_invalidSkipped0.02test_hostha_simulator.py
test_ha_disable_feature_invalidSkipped0.02test_hostha_simulator.py
test_ha_configure_enabledisable_across_clusterzonesSkipped0.02test_hostha_simulator.py
test_configure_ha_provider_validSkipped0.02test_hostha_simulator.py
test_configure_ha_provider_invalidSkipped0.03test_hostha_simulator.py
test_deploy_vgpu_enabled_vmSkipped0.03test_deploy_vgpu_enabled_vm.py
test_3d_gpu_supportSkipped0.04test_deploy_vgpu_enabled_vm.py

@yadvr
yadvr merged commit cd6288e into apache:masterNov 17, 2017
@yadvr

Copy link
Copy Markdown
Member

Tests LGTM, merged. Thanks everyone.

@andrijapanicsb

Copy link
Copy Markdown
Contributor

Resurrecting an old PR - did anyone actually tested the session duration being set correctly (to something else than 30min)?

It's not working in 4.11+ (whatever other value you set, the session is always set to 30min)
Tested by setting session.timeout=2 in the server.properties, restarting mgmt server.

@marcaurele@wido@rafaelweingartner /CC @rhtyd

@marcaurele

Copy link
Copy Markdown
MemberAuthor

@andrijapanicsb I'll have a look and come back here with the fix

@marcaurelemarcaurele mentioned this pull request Oct 31, 2019
5 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@marcaurele@yadvr@blueorangutan@rafaelweingartner@andrijapanicsb@wido